chore: solve merge conflicts

This commit is contained in:
Helias
2022-05-26 17:56:04 +02:00
2 changed files with 1 additions and 2 deletions

View File

@@ -20,7 +20,6 @@
#include "Player.h"
#include "ScriptMgr.h"
#include "Transmogrification.h"
#include "Log.h"
using namespace Acore::ChatCommands;