[ViewVC] Diff of: cvs/deliantra/maps/world/world_104

Comparing deliantra/maps/world/world_104_115.map (file contents):
Revision 1.37 by root, Mon Dec 8 23:37:36 2008 UTC vs.
Revision 1.38 by sf-asarth, Sat Dec 13 00:29:29 2008 UTC

 On the back of the sign is some graffiti:
    Be ever so humble,
    in the presence of greatness,
-   or thou shalt face the rath,
+   or thou shalt face the wrath,
    of a God Scorned!  -- Eric the Cleric
 endmsg
 x 21
 y 40
 end
 end
 arch safe_ground
 x 42
 y 39
 end
+<<<<<<< world_104_115.map
+arch cobblestones2
+x 42
+y 39
+end
+arch sign_w
+name Street of the Gods
+msg
+Street of the Gods...
+On the back of the sign is some graffiti:
+   Be ever so humble,
+   in the presence of greatness,
+   or thou shalt face the wrath,
+   of a God Scorned!  -- Eric the Cleric
+endmsg
+=======
 arch grass
+>>>>>>> 1.37
 x 42
 y 39
 end
 arch safe_ground
 x 42

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines