From 0e92dd560300a0b255b5c173e715f2714e7c1765 Mon Sep 17 00:00:00 2001
From: oy <Tom_Adams@web.de>
Date: Sun, 24 Feb 2013 18:55:55 +0100
Subject: fixed some merge problems

---
 src/versionsrv/versionsrv.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/versionsrv/versionsrv.cpp')

diff --git a/src/versionsrv/versionsrv.cpp b/src/versionsrv/versionsrv.cpp
index da55e717..9d6e2960 100644
--- a/src/versionsrv/versionsrv.cpp
+++ b/src/versionsrv/versionsrv.cpp
@@ -7,6 +7,7 @@
 #include <game/version.h>
 
 #include "versionsrv.h"
+#include "mapversions.h"
 
 enum {
 	MAX_MAPS_PER_PACKET=48,
-- 
cgit 1.4.1