From 1381dbea08cfb35c98a1de89e872b91dbcf68dde Mon Sep 17 00:00:00 2001 From: Cristian C Lalescu <Cristian.Lalescu@mpcdf.mpg.de> Date: Sat, 30 Jul 2022 21:19:08 +0200 Subject: [PATCH] fixes leftover conflict --- TurTLE/test/collisions/stokes_rhs.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TurTLE/test/collisions/stokes_rhs.hpp b/TurTLE/test/collisions/stokes_rhs.hpp index 582f7089..41268149 100644 --- a/TurTLE/test/collisions/stokes_rhs.hpp +++ b/TurTLE/test/collisions/stokes_rhs.hpp @@ -43,7 +43,7 @@ class stokes_rhs: public abstract_particle_rhs public: stokes_rhs(){} ~stokes_rhs(){} - const int getStateSize() const + int getStateSize() const { // 3 numbers for position // // 9 numbers for components of deformation tensor // 3 numbers to store logarithmic factors -- GitLab