From ce050b13beb4453979d8a3dcd9d555c4c1a67345 Mon Sep 17 00:00:00 2001
From: ariel- <ariel.silva305@gmail.com>
Date: Sun, 17 Jan 2016 21:59:38 -0300
Subject: [PATCH] Core/Scripts: Fix merge fail

---
 src/server/scripts/Commands/cs_debug.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp
index f519e6b15fb..de994a7c73a 100644
--- a/src/server/scripts/Commands/cs_debug.cpp
+++ b/src/server/scripts/Commands/cs_debug.cpp
@@ -94,6 +94,7 @@ public:
             { "transport",     rbac::RBAC_PERM_COMMAND_DEBUG_TRANSPORT,     false, &HandleDebugTransportCommand,        "" },
             { "phase",         rbac::RBAC_PERM_COMMAND_DEBUG_PHASE,         false, &HandleDebugPhaseCommand,            "" },
             { "loadcells",     rbac::RBAC_PERM_COMMAND_DEBUG_LOADCELLS,     false, &HandleDebugLoadCellsCommand,        "" },
+            { "boundary",      rbac::RBAC_PERM_COMMAND_DEBUG_BOUNDARY,      false, &HandleDebugBoundaryCommand,         "" }
         };
         static std::vector<ChatCommand> commandTable =
         {