From d175c5fa599fbeb0bd1c57747b6b47dc9a8fad11 Mon Sep 17 00:00:00 2001
From: Carbenium <carbenium@outlook.com>
Date: Wed, 22 Jul 2015 00:16:41 +0200
Subject: [PATCH] Fix merge

---
 src/server/bnetserver/CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/server/bnetserver/CMakeLists.txt b/src/server/bnetserver/CMakeLists.txt
index 0be5d4961dc..15d55f2e8cd 100644
--- a/src/server/bnetserver/CMakeLists.txt
+++ b/src/server/bnetserver/CMakeLists.txt
@@ -46,6 +46,7 @@ endif()
 include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}/dep/zmqpp
+  ${CMAKE_SOURCE_DIR}/dep/cppformat
   ${CMAKE_SOURCE_DIR}/src/server/shared
   ${CMAKE_SOURCE_DIR}/src/server/shared/Configuration
   ${CMAKE_SOURCE_DIR}/src/server/shared/Database
@@ -85,6 +86,7 @@ endif()
 target_link_libraries(bnetserver
   ipc
   shared
+  format
   zmqpp
   ${MYSQL_LIBRARY}
   ${OPENSSL_LIBRARIES}