Uninstall script enhancements.

failiz · Jan 26, 2018 · d275601 · d275601
1 parent e6f186f
commit d275601
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/uninstall_fritzing.sh b/uninstall_fritzing.sh
@@ -67,10 +67,7 @@ done
 
 if [[ "$ACTIVATE" != "true" ]]; then
     echo "(exit 1) Uninstall script not yet activated!" >&2
-<<<<<<< HEAD
     exit 1
-=======
->>>>>>> 59f08c0c4cf25df8c92a89ced1798cf7901dfe8f
 fi
 
 if [[ "$MODE" == "system" && "$ID" -ne 0 ]]; then