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-b93c2d0d6712master
parent
253e3e16e4
commit
ebdbf80626
|
|
@ -6,6 +6,10 @@ width 35
|
||||||
height 27
|
height 27
|
||||||
msg
|
msg
|
||||||
Created: 1993-11-10
|
Created: 1993-11-10
|
||||||
|
<<<<<<< .mine
|
||||||
|
Modified: 2012-04-15 Rick Tanner
|
||||||
|
=======
|
||||||
Modified: 2012-03-20 Rick Tanner
|
Modified: 2012-03-20 Rick Tanner
|
||||||
|
>>>>>>> .r17952
|
||||||
endmsg
|
endmsg
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue