From 831764c116e225a86aeddfc865cf9ef876d171d3 Mon Sep 17 00:00:00 2001 From: Waverunner Date: Tue, 18 Aug 2015 08:26:15 -0400 Subject: [PATCH] Merge conflict fix from prior commit --- cfg/features.cfg | 6 +----- cfg/network.cfg | 6 +----- cfg/nge.cfg | 6 +----- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/cfg/features.cfg b/cfg/features.cfg index 66db0f670..539418e7c 100644 --- a/cfg/features.cfg +++ b/cfg/features.cfg @@ -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 diff --git a/cfg/network.cfg b/cfg/network.cfg index c46191f87..34a2bfd64 100644 --- a/cfg/network.cfg +++ b/cfg/network.cfg @@ -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 diff --git a/cfg/nge.cfg b/cfg/nge.cfg index 898db3f41..069b17340 100644 --- a/cfg/nge.cfg +++ b/cfg/nge.cfg @@ -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