McUles
/
firmware
forked from freifunk-franken/firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bsp/default/fastdstart.sh.tpl: remove garbage 

Signed-off-by: Tim Niemeyer <tim.niemeyer@mastersword.de>
This commit is contained in:
Tim Niemeyer 2013-10-04 22:40:58 +02:00
parent fb76148c46
commit 6893bf00fb
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bsp/default/root_file_system/etc/fastdstart.sh.tpl
View File

@ -3,11 +3,7 @@
SERVER="no"
#SERVERNAME="--servername--"
<<<<<<< HEAD:bsp/default/root_file_system/etc/fastdstart.sh
project="ffol"
=======
project="${VPN_PROJECT}"
>>>>>>> 8804270... buildscript: support community file with templates:bsp/default/root_file_system/etc/fastdstart.sh.tpl
test_internet_host1="mastersword.de"
test_internet_host2="109.163.229.254"