1 files changed, 4 insertions, 1 deletions

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