1 files changed, 3 insertions, 24 deletions

diff --git a/OpenSim/Data/SQLite/SQLiteFramework.cs b/OpenSim/Data/SQLite/SQLiteFramework.cs
index 79eaab3..9567727 100644
--- a/OpenSim/Data/SQLite/SQLiteFramework.cs
+++ b/OpenSim/Data/SQLite/SQLiteFramework.cs
@@ -57,19 +57,7 @@ namespace OpenSim.Data.SQLite
         {
             lock (m_Connection)
             {
-<<<<<<< HEAD:OpenSim/Data/SQLite/SQLiteFramework.cs
                 cmd.Connection = m_Connection;
-=======
-/*
-                SqliteConnection newConnection =
-                        (SqliteConnection)((ICloneable)connection).Clone();
-                newConnection.Open();
-
-                cmd.Connection = newConnection;
-*/
-                cmd.Connection = connection;
-                //Console.WriteLine("XXX " + cmd.CommandText);
->>>>>>> cc67de5... rename SQLiteNG to SQLite and SQLite to SQLiteLegacy:OpenSim/Data/SQLite/SQLiteFramework.cs
 
                 return cmd.ExecuteNonQuery();
             }
@@ -77,27 +65,18 @@ namespace OpenSim.Data.SQLite
         
         protected IDataReader ExecuteReader(SqliteCommand cmd)
         {
-<<<<<<< HEAD:OpenSim/Data/SQLite/SQLiteFramework.cs
-            SqliteConnection newConnection =
-                    (SqliteConnection)((ICloneable)m_Connection).Clone();
-            newConnection.Open();
-
-            cmd.Connection = newConnection;
-            return cmd.ExecuteReader();
-=======
-            lock (connection)
+            lock (m_Connection)
             {
                 //SqliteConnection newConnection =
                 //        (SqliteConnection)((ICloneable)connection).Clone();
                 //newConnection.Open();
 
                 //cmd.Connection = newConnection;
-                cmd.Connection = connection;
+                cmd.Connection = m_Connection;
                 //Console.WriteLine("XXX " + cmd.CommandText);
 
                 return cmd.ExecuteReader();
             }
->>>>>>> cc67de5... rename SQLiteNG to SQLite and SQLite to SQLiteLegacy:OpenSim/Data/SQLite/SQLiteFramework.cs
         }
 
         protected void CloseReaderCommand(SqliteCommand cmd)
@@ -107,4 +86,4 @@ namespace OpenSim.Data.SQLite
             cmd.Dispose();
         }
     }
-}
+}
\ No newline at end of file