From b1568993903333a7c95c9839fb863b994b1a5833 Mon Sep 17 00:00:00 2001
From: Sally Coolatta <tehrealsalt@gmail.com>
Date: Sun, 2 Aug 2020 16:36:40 -0400
Subject: [PATCH] More d_netcmd.h

---
 src/d_netcmd.h | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/d_netcmd.h b/src/d_netcmd.h
index 0b1cbb0ae..514867e21 100644
--- a/src/d_netcmd.h
+++ b/src/d_netcmd.h
@@ -181,7 +181,6 @@ typedef enum
 	XD_SETMOTD,     // 19
 	XD_RESPAWN,     // 20
 	XD_DEMOTED,     // 21
-<<<<<<< HEAD
 	XD_SETUPVOTE,   // 22
 	XD_MODIFYVOTE,  // 23
 	XD_PICKVOTE,    // 24
@@ -193,15 +192,9 @@ typedef enum
 	XD_CANCELPARTYINVITE, // 30
 	XD_GIVEITEM, // 31
 	XD_ADDBOT, // 32
-#ifdef HAVE_BLUA
 	XD_LUACMD,      // 33
 	XD_LUAVAR,      // 34
-#endif
-=======
-	XD_LUACMD,      // 22
-	XD_LUAVAR,      // 23
-	XD_LUAFILE,     // 24
->>>>>>> srb2/next
+	XD_LUAFILE,     // 35
 	MAXNETXCMD
 } netxcmd_t;