Merge messages.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@16659 282e977c-c81d-0410-88c4-b93c2d0d6712
2012-01-15 13:41:26 +00:00 · 2012-01-15 13:41:26 +00:00 · 4a1470f314
parent ac5ab200ea
commit 4a1470f314
1 changed files with 2 additions and 3 deletions
--- a/world/world_111_117
+++ b/world/world_111_117
@ -3,7 +3,7 @@ name world_111_117
 width 50
 height 50
 msg
-Modified: 2010-05-05 Cavesomething
+Modified: 2012-01-15 Nicolas Weeger
 endmsg
 outdoor 1
 tile_path_1 world_111_116
@ -12378,8 +12378,7 @@ elevation 9882
 end
 arch magic_mouth
 msg
-You notice a well-hidden cave, high in
-the mountains here.
+You notice a well-hidden cave, high in the mountains here.
 endmsg
 x 39
 y 42