shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update admin.dm

Browse Source
This commit is contained in:
LetterJay
2017-09-11 14:22:23 -05:00
committed by GitHub
parent 92b78d3298
commit 7cdd5eaa02
1 changed files with 74 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/admin.dm
-3
View File
@@ -1,4 +1,3 @@
<<<<<<< HEAD
//A set of constants used to determine which type of mute an admin wishes to apply: //A set of constants used to determine which type of mute an admin wishes to apply:
//Please read and understand the muting/automuting stuff before changing these. MUTE_IC_AUTO etc = (MUTE_IC << 1) //Please read and understand the muting/automuting stuff before changing these. MUTE_IC_AUTO etc = (MUTE_IC << 1)
//Therefore there needs to be a gap between the flags_1 for the automute flags_1 //Therefore there needs to be a gap between the flags_1 for the automute flags_1
@@ -73,7 +72,6 @@
#define AHELP_ACTIVE 1 #define AHELP_ACTIVE 1
#define AHELP_CLOSED 2 #define AHELP_CLOSED 2
#define AHELP_RESOLVED 3 #define AHELP_RESOLVED 3
=======
//A set of constants used to determine which type of mute an admin wishes to apply: //A set of constants used to determine which type of mute an admin wishes to apply:
//Please read and understand the muting/automuting stuff before changing these. MUTE_IC_AUTO etc = (MUTE_IC << 1) //Please read and understand the muting/automuting stuff before changing these. MUTE_IC_AUTO etc = (MUTE_IC << 1)
//Therefore there needs to be a gap between the flags for the automute flags //Therefore there needs to be a gap between the flags for the automute flags
@@ -148,4 +146,3 @@
#define AHELP_ACTIVE 1 #define AHELP_ACTIVE 1
#define AHELP_CLOSED 2 #define AHELP_CLOSED 2
#define AHELP_RESOLVED 3 #define AHELP_RESOLVED 3
>>>>>>> 84b1e3d... [s] Adds a security token to all admin hrefs (#29839)