mirror of
https://github.com/PirateBox-Dev/PirateBoxScripts_Webserver.git
synced 2023-12-14 07:22:58 +01:00
fix Makefile from 1.0.7 merge
This commit is contained in:
parent
51648b6779
commit
4dd3ff9fe6
4
Makefile
4
Makefile
|
@ -1,9 +1,5 @@
|
||||||
NAME = piratebox-ws
|
NAME = piratebox-ws
|
||||||
<<<<<<< HEAD
|
|
||||||
VERSION = 1.1.0
|
VERSION = 1.1.0
|
||||||
=======
|
|
||||||
VERSION = 1.0.7
|
|
||||||
>>>>>>> release-1.0.7
|
|
||||||
ARCH = all
|
ARCH = all
|
||||||
PB_FOLDER=piratebox
|
PB_FOLDER=piratebox
|
||||||
PB_SRC_FOLDER=$(PB_FOLDER)/$(PB_FOLDER)
|
PB_SRC_FOLDER=$(PB_FOLDER)/$(PB_FOLDER)
|
||||||
|
|
Loading…
Reference in a new issue