nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

resolve a merge conflict that got by into master

Browse Source
This commit is contained in:
nhmall
2018-08-16 08:09:40 -04:00
parent 6f4b2ffbad
commit 772d352652
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sp_lev.c
-4
View File
@@ -2552,13 +2552,9 @@ region *tmpregion;
} }
} }
<<<<<<< HEAD
/* initialization common to all special levels */ /* initialization common to all special levels */
/* XXX dup name in mkmap.c */ /* XXX dup name in mkmap.c */
void
=======
STATIC_OVL void STATIC_OVL void
>>>>>>> NetHack-3.6.2
wallify_map(x1, y1, x2, y2) wallify_map(x1, y1, x2, y2)
int x1, y1, x2, y2; int x1, y1, x2, y2;
{ {