1 files changed, 0 insertions, 3 deletions

diff --git a/OpenSim/Data/PGSQL/Resources/UserProfiles.migrations b/OpenSim/Data/PGSQL/Resources/UserProfiles.migrations
index a67107a..c1580b2 100644
--- a/OpenSim/Data/PGSQL/Resources/UserProfiles.migrations
+++ b/OpenSim/Data/PGSQL/Resources/UserProfiles.migrations
@@ -81,7 +81,6 @@ CREATE TABLE userdata (
 
 commit;
 
-<<<<<<< HEAD
 :VERSION 3        # -------------------------------
 begin;
 CREATE TABLE usersettings (
@@ -154,5 +153,3 @@ BEGIN;
 ALTER TABLE usersettings ALTER COLUMN imviaemail SET DATA TYPE boolean USING CASE WHEN false THEN false ELSE true END;
 
 COMMIT;
-=======
->>>>>>> avn/ubitvar