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

Update networks.dm

Browse Source
This commit is contained in:
deathride58
2018-04-29 18:48:26 -04:00
committed by GitHub
parent 6ed120aad4
commit b7cdd6a7fd
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/networks.dm
-4
View File
@@ -1,7 +1,3 @@
<<<<<<< HEAD
#define HID_RESTRICTED_END 101 //the first nonrestricted ID, automatically assigned on connection creation.
=======
#define HID_RESTRICTED_END 101 //the first nonrestricted ID, automatically assigned on connection creation.
#define NETWORK_BROADCAST_ID "ALL"
>>>>>>> 19ce08f... More integrated circuits and NTNET upgrade! (#37165)