diff options
Diffstat (limited to 'src/trinitycore/Master.cpp')
| -rw-r--r-- | src/trinitycore/Master.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/trinitycore/Master.cpp b/src/trinitycore/Master.cpp index 7e48b97eb4f..b9bf375628b 100644 --- a/src/trinitycore/Master.cpp +++ b/src/trinitycore/Master.cpp @@ -317,13 +317,8 @@ int Master::Run() { FreezeDetectorRunnable *fdr = new FreezeDetectorRunnable(); fdr->SetDelayTime(freeze_delay*1000); -<<<<<<< HEAD:src/mangosd/Master.cpp - ACE_Based::Thread t(*fdr); - t.setPriority(ACE_Based::High); -======= ACE_Based::Thread t(fdr); t.setPriority(ACE_Based::Highest); ->>>>>>> ca55c2a9d069aaef0d3deafb4884bfd8d3884444:src/mangosd/Master.cpp } ///- Launch the world listener socket |