fix Makefile from 1.0.7 merge

This commit is contained in:
Matthias Strubel 2016-02-09 22:15:07 +01:00
parent 51648b6779
commit 4dd3ff9fe6
1 changed files with 0 additions and 4 deletions

View File

@ -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)