From 4dd3ff9fe6a05e92b397bd33b1fdefe298c0eeae Mon Sep 17 00:00:00 2001
From: Matthias Strubel <matthias.strubel@aod-rpg.de>
Date: Tue, 9 Feb 2016 22:15:07 +0100
Subject: [PATCH] fix Makefile from 1.0.7 merge

---
 Makefile | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Makefile b/Makefile
index b47c6ff..e5ed931 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,5 @@
 NAME = piratebox-ws
-<<<<<<< HEAD
 VERSION = 1.1.0
-=======
-VERSION = 1.0.7
->>>>>>> release-1.0.7
 ARCH = all
 PB_FOLDER=piratebox
 PB_SRC_FOLDER=$(PB_FOLDER)/$(PB_FOLDER)