projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-09-29 14:13:03 -04:00
Code Issues Projects Releases Wiki Activity

Merge conflict fix from prior commit

Browse Source
This commit is contained in:
Waverunner
2015-08-18 08:26:15 -04:00
parent 9adf303af2
commit 831764c116
3 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cfg/features.cfg
+1 -5
View File
@@ -1,5 +1 @@
<<<<<<< Updated upstream
# 12/08/2015 21:56:03 CDT
=======
# 15/08/2015 18:18:06 CDT
>>>>>>> Stashed changes
# 18/08/2015 08:24:35 EDT
cfg/network.cfg
+1 -5
View File
@@ -1,8 +1,4 @@
<<<<<<< Updated upstream
# 12/08/2015 21:56:03 CDT
=======
# 15/08/2015 18:18:06 CDT
>>>>>>> Stashed changes
# 18/08/2015 08:24:35 EDT
AUTO-LOGIN=0
LOGIN-PORT=44453
LOGIN-SERVER-ID=1
cfg/nge.cfg
+1 -5
View File
@@ -1,8 +1,4 @@
<<<<<<< Updated upstream
# 12/08/2015 21:56:03 CDT
=======
# 15/08/2015 18:18:06 CDT
>>>>>>> Stashed changes
# 18/08/2015 08:24:35 EDT
CLEAN-CHARACTER-DATA=0
ENABLE-LOGGING=true
GALAXY-MAX-CHARACTERS=1000000