Jump to content

[Mangos-0.12][unwelcome typo in config]


Guest mns

Recommended Posts

diff --git a/src/mangosd/mangosd.conf.dist.in b/src/mangosd/mangosd.conf.dist.in
index 8716cf7..29addce 100644
--- a/src/mangosd/mangosd.conf.dist.in
+++ b/src/mangosd/mangosd.conf.dist.in
@@ -1382,8 +1382,6 @@ Ra.Stricted = 1
SOAP.Enabled = 0
SOAP.IP = 127.0.0.1
SOAP.Port = 7878
-<<<<<<< HEAD
-=======

###################################################################################################################
#    CharDelete.Method
@@ -1411,4 +1409,3 @@ SOAP.Port = 7878
CharDelete.Method = 0
CharDelete.MinLevel = 0
CharDelete.KeepDays = 30
->>>>>>> e8e3ff9... [9767] Add the posibility to keep deleted characters in the database for a while and also add related commands.

Link to comment
Share on other sites

×
×
  • Create New...

Important Information

We have placed cookies on your device to help make this website better. You can adjust your cookie settings, otherwise we'll assume you're okay to continue. Privacy Policy Terms of Use