missed a conflict

2015-04-02 19:24:10 -04:00
parent c43e8f9d31
commit 7a3e7aaf64
1 changed files with 1 additions and 4 deletions
--- a/include/context.h
+++ b/include/context.h
@@ -116,11 +116,8 @@ struct context_info {
 	struct book_info spbook;
 	struct takeoff_info takeoff;
 	struct warntype_info warntype;
-<<<<<<< HEAD
-	struct tribute_info tribute;
-=======
 	struct polearm_info polearm;
->>>>>>> master
+	struct tribute_info tribute;
 };

 extern NEARDATA struct context_info context;