removes conflict marker
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 6 Aug 2015 09:33:23 +0000 (11:33 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 6 Aug 2015 09:33:23 +0000 (11:33 +0200)
commit30dab05ab5a3f56f51b5674f8b86241422a65f9c
treed3244ce9f82c13ab7c10aef06acba737e16a2573
parente5e0cbd5c675e7a838da711b6e78f67b5f7bc28c
removes conflict marker

Change-Id: I3d31fc9774e2f28afab3ac7a9a9a21508c8c738d
tine20/Tinebase/User/Sql.php