1 files changed, 0 insertions, 6 deletions

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 26acac7..4c579c9 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1003,14 +1003,8 @@
     ; false to allow script controlled underground positioning of
     ; prims
     ; DisableUndergroundMovement = true
-<<<<<<< HEAD:bin/OpenSimDefaults.ini
 
-    ; Path to script engine assemblies
-    ; Default is ./bin/ScriptEngines
-=======
-   
     ;; Path to script assemblies 
->>>>>>> 298b4c0... Some cleanup to OpenSimDefaults.ini:OpenSim/Region/Application/OpenSimDefaults.ini
     ; ScriptEnginesPath = "ScriptEngines"
 
 [OpenGridProtocol]