--- deliantra/arch/exit/Pentagram/pentagram.arc	2007/03/03 01:13:55	1.7
+++ deliantra/arch/exit/Pentagram/pentagram.arc	2007/03/03 01:36:05	1.9
@@ -41,13 +41,8 @@
 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
@@ -60,14 +55,9 @@
 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
@@ -80,14 +70,9 @@
 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
@@ -100,13 +85,8 @@
 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
@@ -134,14 +114,9 @@
 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