From cdaed113872f0615a0d2864cc54064a4432054c6 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Thu, 3 Sep 2015 18:39:08 +0100
Subject:  at last we can login and see objects ( friends is dead and disable
 in  scenepresence)

---
 OpenSim/Data/MySQL/Resources/UserProfiles.migrations | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'OpenSim/Data/MySQL/Resources/UserProfiles.migrations')

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