diff options
Diffstat (limited to 'src/qcommon')
| -rw-r--r-- | src/qcommon/q_shared.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/qcommon/q_shared.h b/src/qcommon/q_shared.h index 68fd619a..84408371 100644 --- a/src/qcommon/q_shared.h +++ b/src/qcommon/q_shared.h @@ -1039,12 +1039,7 @@ typedef struct { #define MAX_STATS 16 #define MAX_PERSISTANT 16 #define MAX_MISC 16 -<<<<<<< #define MAX_WEAPONS 16 -||||||| -======= -#define MAX_WEAPONS 16 ->>>>>>> #define MAX_PS_EVENTS 2 |