--- deliantra/arch/exit/Pentagram/pentagram.arc	2007/03/03 01:13:55	1.7
+++ deliantra/arch/exit/Pentagram/pentagram.arc	2007/03/03 01:22:13	1.8
@@ -41,18 +41,16 @@
 more
 object pentagram_121
 name pentagram
-<<<<<<< pentagram.arc
-face pentagram.x11
-magicmap black
-=======
 face pentagram.x11
 y 1
->>>>>>> 1.5
 speed 0
 type 41
 no_pick 1
 activate_on_push 1
 activate_on_release 1
+<<<<<<< pentagram.arc
+======= 
+>>>>>>> 1.5
 editable 50
 magicmap black
 visibility 50
@@ -60,19 +58,17 @@
 more
 object pentagram_122
 name pentagram
-<<<<<<< pentagram.arc
-face pentagram.x11
-magicmap black
-=======
 face pentagram.x11
 x 1
 y 1
->>>>>>> 1.5
 speed 0
 type 41
 no_pick 1
 activate_on_push 1
 activate_on_release 1
+<<<<<<< pentagram.arc
+======= 
+>>>>>>> 1.5
 editable 50
 magicmap black
 visibility 50
@@ -80,19 +76,17 @@
 more
 object pentagram_123
 name pentagram
-<<<<<<< pentagram.arc
-face pentagram.x11
-magicmap black
-=======
 face pentagram.x11
 x 2
 y 1
->>>>>>> 1.5
 speed 0
 type 41
 no_pick 1
 activate_on_push 1
 activate_on_release 1
+<<<<<<< pentagram.arc
+======= 
+>>>>>>> 1.5
 editable 50
 magicmap black
 visibility 50
@@ -100,18 +94,16 @@
 more
 object pentagram_131
 name pentagram
-<<<<<<< pentagram.arc
-face pentagram.x11
-magicmap black
-=======
 face pentagram.x11
 y 2
->>>>>>> 1.5
 speed 0
 type 41
 no_pick 1
 activate_on_push 1
 activate_on_release 1
+<<<<<<< pentagram.arc
+======= 
+>>>>>>> 1.5
 editable 50
 magicmap black
 visibility 50
@@ -134,19 +126,17 @@
 more
 object pentagram_133
 name pentagram
-<<<<<<< pentagram.arc
-face pentagram.x11
-magicmap black
-=======
 face pentagram.x11
 x 2
 y 2
->>>>>>> 1.5
 speed 0
 type 41
 no_pick 1
 activate_on_push 1
 activate_on_release 1
+<<<<<<< pentagram.arc
+======= 
+>>>>>>> 1.5
 editable 50
 magicmap black
 visibility 50