Revert accidental check of changes to Navar Houses (navar_city/city1houses).

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@17953 282e977c-c81d-0410-88c4-b93c2d0d6712
2012-04-15 06:36:54 +00:00 · 2012-04-15 06:36:54 +00:00 · ebdbf80626
parent 253e3e16e4
commit ebdbf80626
1 changed files with 4 additions and 0 deletions
--- a/navar_city/city1houses
+++ b/navar_city/city1houses
@ -6,6 +6,10 @@ width 35
 height 27
 msg
 Created:  1993-11-10
+<<<<<<< .mine
+Modified: 2012-04-15 Rick Tanner
+=======
 Modified: 2012-03-20 Rick Tanner
+>>>>>>> .r17952
 endmsg
 end