--- deliantra/arch/exit/Pentagram/pentagram.arc	2007/02/06 22:40:00	1.3
+++ deliantra/arch/exit/Pentagram/pentagram.arc	2007/03/03 01:22:13	1.8
@@ -13,7 +13,7 @@
 more
 object pentagram_112
 name pentagram
-face pentagram.x12
+face pentagram.x11
 x 1
 speed 0
 type 41
@@ -27,7 +27,7 @@
 more
 object pentagram_113
 name pentagram
-face pentagram.x13
+face pentagram.x11
 x 2
 speed 0
 type 41
@@ -41,13 +41,16 @@
 more
 object pentagram_121
 name pentagram
-face pentagram.x21
+face pentagram.x11
 y 1
 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
@@ -55,7 +58,7 @@
 more
 object pentagram_122
 name pentagram
-face pentagram.x22
+face pentagram.x11
 x 1
 y 1
 speed 0
@@ -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
@@ -70,7 +76,7 @@
 more
 object pentagram_123
 name pentagram
-face pentagram.x23
+face pentagram.x11
 x 2
 y 1
 speed 0
@@ -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
@@ -85,13 +94,16 @@
 more
 object pentagram_131
 name pentagram
-face pentagram.x31
+face pentagram.x11
 y 2
 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
@@ -99,7 +111,7 @@
 more
 object pentagram_132
 name pentagram
-face pentagram.x32
+face pentagram.x11
 x 1
 y 2
 speed 0
@@ -114,7 +126,7 @@
 more
 object pentagram_133
 name pentagram
-face pentagram.x33
+face pentagram.x11
 x 2
 y 2
 speed 0
@@ -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