aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--archfi4
-rwxr-xr-xmakerelease1
2 files changed, 4 insertions, 1 deletions
diff --git a/archfi b/archfi
index f2c665d..fb7e8e8 100644
--- a/archfi
+++ b/archfi
@@ -12,7 +12,11 @@
# referance : https://wiki.archlinux.org/index.php/Installation_guide
+<<<<<<< HEAD
+apptitle="Arch Linux Fast Install (archfi) - Version: 2019.01.10.23.16.00 (GPLv3)"
+=======
apptitle="Arch Linux Fast Install (archfi) - Version: 2019.02.02.22.54.56 (GPLv3)"
+>>>>>>> src
baseurl=https://raw.githubusercontent.com/MatMoul/archfi/master
skipfont="0"
diff --git a/makerelease b/makerelease
index 2e3baae..7ae0976 100755
--- a/makerelease
+++ b/makerelease
@@ -62,7 +62,6 @@ case "$choice" in
esac
git checkout master
-git pull
echo "Push release..."
git push