--- deliantra/arch/exit/Pentagram/pentagram.arc	2007/03/03 01:22:13	1.8
+++ deliantra/arch/exit/Pentagram/pentagram.arc	2007/03/03 01:36:05	1.9
@@ -48,9 +48,6 @@
 no_pick 1
 activate_on_push 1
 activate_on_release 1
-<<<<<<< pentagram.arc
-======= 
->>>>>>> 1.5
 editable 50
 magicmap black
 visibility 50
@@ -66,9 +63,6 @@
 no_pick 1
 activate_on_push 1
 activate_on_release 1
-<<<<<<< pentagram.arc
-======= 
->>>>>>> 1.5
 editable 50
 magicmap black
 visibility 50
@@ -84,9 +78,6 @@
 no_pick 1
 activate_on_push 1
 activate_on_release 1
-<<<<<<< pentagram.arc
-======= 
->>>>>>> 1.5
 editable 50
 magicmap black
 visibility 50
@@ -101,9 +92,6 @@
 no_pick 1
 activate_on_push 1
 activate_on_release 1
-<<<<<<< pentagram.arc
-======= 
->>>>>>> 1.5
 editable 50
 magicmap black
 visibility 50
@@ -134,9 +122,6 @@
 no_pick 1
 activate_on_push 1
 activate_on_release 1
-<<<<<<< pentagram.arc
-======= 
->>>>>>> 1.5
 editable 50
 magicmap black
 visibility 50