Updated install.sh

Bonandry · May 17, 2019 · 133d145 · 133d145
1 parent 7b992d9
commit 133d145
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/install.sh b/install.sh
@@ -5,11 +5,7 @@ set -e
 # these variables can be overwritten
 : "${DESTDIR:=/usr/share/icons}"
 : "${TAG:=master}"
-<<<<<<< HEAD
-: "${THEMES:=GNOME++}"
-=======
 : "${THEMES:=GNOME++ GNOME++-Colorful GNOME++-Dark}"
->>>>>>> f4df92982ddae1fb1c24e8beef3779edd3d688b9
 : "${uninstall:=false}"
 
 gh_url="https://github.com/Bonandry"