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

missed a conflict

Browse Source
This commit is contained in:
nhmall
2015-04-02 19:24:10 -04:00
parent c43e8f9d31
commit 7a3e7aaf64
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/context.h
+1 -4
View File
@@ -116,11 +116,8 @@ struct context_info {
struct book_info spbook; struct book_info spbook;
struct takeoff_info takeoff; struct takeoff_info takeoff;
struct warntype_info warntype; struct warntype_info warntype;
<<<<<<< HEAD
struct tribute_info tribute;
=======
struct polearm_info polearm; struct polearm_info polearm;
>>>>>>> master struct tribute_info tribute;
}; };
extern NEARDATA struct context_info context; extern NEARDATA struct context_info context;