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