Fix a bunch of issues that crop up after the naive porting of the new sqlite db from master to 0.6.9

1 files changed, 1 insertions, 5 deletions

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;
         }
     }