1 files changed, 1 insertions, 6 deletions

diff --git a/OpenSim/Services/Base/ServiceBase.cs b/OpenSim/Services/Base/ServiceBase.cs
index 09dcbef..c18226b 100644
--- a/OpenSim/Services/Base/ServiceBase.cs
+++ b/OpenSim/Services/Base/ServiceBase.cs
@@ -47,7 +47,6 @@ namespace OpenSim.Services.Base
 
         public T LoadPlugin<T>(string dllName, Object[] args) where T:class
         {
-<<<<<<< HEAD
             // The path:type separator : is unfortunate because it collides
             // with Windows paths like C:\...
             // When the path provided includes the drive, this fails.
@@ -55,11 +54,7 @@ namespace OpenSim.Services.Base
             string pathRoot = Path.GetPathRoot(dllName);
             string noRoot = dllName.Substring(pathRoot.Length);
             string[] parts = noRoot.Split(new char[] {':'});
-=======
-            string pathRoot = Path.GetPathRoot(dllName);
-            string noRoot = dllName.Substring(pathRoot.Length);
-            string[] parts = noRoot.Split(new char[] { ':' });
->>>>>>> avn/ubitvar
+
 
             dllName = pathRoot + parts[0];