1 files changed, 0 insertions, 4 deletions

diff --git a/OpenSim/Data/MySQL/Resources/RegionStore.migrations b/OpenSim/Data/MySQL/Resources/RegionStore.migrations
index 738f5c2..097271a 100644
--- a/OpenSim/Data/MySQL/Resources/RegionStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/RegionStore.migrations
@@ -939,7 +939,6 @@ ALTER TABLE prims ADD COLUMN AttachedPosY double default 0;
 ALTER TABLE prims ADD COLUMN AttachedPosZ double default 0;
 ALTER TABLE primshapes ADD COLUMN LastAttachPoint int(4) not null default '0';
 COMMIT;
-<<<<<<< HEAD
 
 :VERSION 50        #---- Change LandFlags to unsigned
 
@@ -948,6 +947,3 @@ BEGIN;
 ALTER TABLE land CHANGE COLUMN LandFlags LandFlags int unsigned default null;
 
 COMMIT;
-
-=======
->>>>>>> avn/ubitvar