Fixed some merging errors, there could be more, but at least it compiles.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/server/shared/Packets/ByteBuffer.h b/src/server/shared/Packets/ByteBuffer.h
index 24ca412d6f2..1e346760e30 100755
--- a/src/server/shared/Packets/ByteBuffer.h
+++ b/src/server/shared/Packets/ByteBuffer.h
@@ -416,14 +416,14 @@ class ByteBuffer
         uint8& operator[](size_t const pos)
         {
             if (pos >= size())
-                throw ByteBufferException(false, pos, 1, size());
+                throw ByteBufferPositionException(false, pos, 1, size());
             return _storage[pos];
         }
 
         uint8 const& operator[](size_t const pos) const
         {
             if (pos >= size())
-                throw ByteBufferException(false, pos, 1, size());
+                throw ByteBufferPositionException(false, pos, 1, size());
             return _storage[pos];
         }