Resolve merge errors.

failiz · Jan 26, 2018 · e6f186f · e6f186f
2 parents 6fe92ed + 59f08c0
commit e6f186f
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/uninstall_fritzing.sh b/uninstall_fritzing.sh
@@ -67,7 +67,10 @@ 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