resolve conflicting files

Author: hoehnp

README.md

@@ -18,7 +18,7 @@ Current vehicle position from gpsd or directly from NMEA (GPS) sensors. \
 Optimal routes and directions spoken in 70+ languages. \
 Points of interest (POIs) in many formats.
 
-Help and more info available on [the wiki](https://wiki.navit-project.org/index.php/Main_Page). \
+Help and more info available on [the wiki](https://navit.readthedocs.io/en/v0.5.6/). \
 The [Reporting Bugs](http://wiki.navit-project.org/index.php/Reporting_Bugs) document helps you file issues.
 
 Maps

scripts/build_linux.sh

@@ -13,7 +13,7 @@ pushd $BUILD_PATH
     echo "Building..."
 cmake ${cmake_opts} ../
 make -j $(nproc --all)
-#make package
+make package
 
 if [[ "$CIRCLE_ARTIFACTS" != "" ]]; then
 	echo "Copying icons to artifacts..."