1 files changed, 3 insertions, 0 deletions

diff --git a/OpenSim/Data/MySQL/Resources/UserProfiles.migrations b/OpenSim/Data/MySQL/Resources/UserProfiles.migrations
index 87e99fa..3df9b9b 100644
--- a/OpenSim/Data/MySQL/Resources/UserProfiles.migrations
+++ b/OpenSim/Data/MySQL/Resources/UserProfiles.migrations
@@ -81,6 +81,7 @@ CREATE TABLE IF NOT EXISTS `userdata` (
 
 commit;
 
+<<<<<<< HEAD
 :VERSION 3         # -------------------------------
 begin;
 CREATE TABLE IF NOT EXISTS `usersettings` (
@@ -96,3 +97,5 @@ commit;
 begin;
 ALTER TABLE userpicks ADD COLUMN gatekeeper varchar(255);
 commit;
+=======
+>>>>>>> avn/ubitvar