From 74da2ff079653885d4de65f11623216bde34a94c Mon Sep 17 00:00:00 2001
From: Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>
Date: Wed, 29 Dec 2010 20:09:43 +0100
Subject: protocol.h -> manaserv_protocol.h to avoid conflicts with mysql
 files.

Resolves: Mana-Mantis #278.
---
 src/account-server/serverhandler.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/account-server/serverhandler.cpp')

diff --git a/src/account-server/serverhandler.cpp b/src/account-server/serverhandler.cpp
index 2e471994..b41a4417 100644
--- a/src/account-server/serverhandler.cpp
+++ b/src/account-server/serverhandler.cpp
@@ -37,7 +37,7 @@
 #include "serialize/characterdata.h"
 #include "utils/logger.h"
 #include "utils/tokendispenser.h"
-#include "protocol.h"
+#include "manaserv_protocol.h"
 
 struct MapStatistics
 {
-- 
cgit v1.2.3-70-g09d2