bad merge?

1 files changed, 8 insertions, 1 deletions

diff --git a/OpenSim/Server/Handlers/BakedTextures/XBakesPostHandler.cs b/OpenSim/Server/Handlers/BakedTextures/XBakesPostHandler.cs
index e38543b..502cecf 100644
--- a/OpenSim/Server/Handlers/BakedTextures/XBakesPostHandler.cs
+++ b/OpenSim/Server/Handlers/BakedTextures/XBakesPostHandler.cs
@@ -45,12 +45,19 @@ namespace OpenSim.Server.Handlers.BakedTextures
 {
     public class BakesServerPostHandler : BaseStreamHandler
     {
+<<<<<<< HEAD:OpenSim/Server/Handlers/BakedTextures/XBakesPostHandler.cs
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private IBakedTextureService m_BakesService;
 
         public BakesServerPostHandler(IBakedTextureService service, IServiceAuth auth) :
                 base("POST", "/bakes", auth)
+=======
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        
+        public MSSQLAvatarData(string connectionString, string realm) :
+                base(connectionString, realm, "Avatar")
+>>>>>>> avn/ubitvar:OpenSim/Data/MSSQL/MSSQLAvatarData.cs
         {
             m_BakesService = service;
         }
@@ -73,4 +80,4 @@ namespace OpenSim.Server.Handlers.BakedTextures
             return new byte[0];
         }
     }
-}
\ No newline at end of file
+}