From 0b8b302aa0f2ee25be5cbdfefe232459e6e5b778 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 30 Apr 2010 20:05:57 +0100
Subject: Fix a bunch of issues that crop up after the naive porting of the new
 sqlite db from master to 0.6.9

---
 OpenSim/Data/SQLite/SQLiteXInventoryData.cs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'OpenSim/Data/SQLite/SQLiteXInventoryData.cs')

diff --git a/OpenSim/Data/SQLite/SQLiteXInventoryData.cs b/OpenSim/Data/SQLite/SQLiteXInventoryData.cs
index 0650a86..0d211b6 100644
--- a/OpenSim/Data/SQLite/SQLiteXInventoryData.cs
+++ b/OpenSim/Data/SQLite/SQLiteXInventoryData.cs
@@ -147,12 +147,8 @@ namespace OpenSim.Data.SQLite
             }
 
             reader.Close();
-<<<<<<< HEAD:OpenSim/Data/SQLite/SQLiteXInventoryData.cs
-            CloseReaderCommand(cmd);
-=======
+            
             //CloseCommand(cmd);
->>>>>>> cc67de5... rename SQLiteNG to SQLite and SQLite to SQLiteLegacy:OpenSim/Data/SQLite/SQLiteXInventoryData.cs
-
             return perms;
         }
     }
-- 
cgit v1.1