From 7a3e7aaf649a69579dd3b1712388bcb03357fb7c Mon Sep 17 00:00:00 2001 From: nhmall Date: Thu, 2 Apr 2015 19:24:10 -0400 Subject: [PATCH] missed a conflict --- include/context.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/include/context.h b/include/context.h index d25af4371..a544f6ae0 100644 --- 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;