missed a conflict

diff --git a/include/context.h b/include/context.h
index d25af437109a62c6164bbc84bc9726e1e3f2a540..a544f6ae0c70e571457a5ae57797b41b2584d370 100644 (file)
--- 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;