aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--archfi8
1 files changed, 8 insertions, 0 deletions
diff --git a/archfi b/archfi
index b9454c4..c30f8dd 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: 2016.04.12.23.45.07 (GPLv3)"
+=======
+apptitle="Arch Linux Fast Install (archfi) - Version: 2016.04.12.23.56.56 (GPLv3)"
+>>>>>>> src
baseurl=https://raw.githubusercontent.com/MatMoul/archfi/master
@@ -1339,6 +1343,10 @@ loadstrings(){
while (( "$#" )); do
case $1 in
baseurl=https://raw.githubusercontent.com/MatMoul/archfi/master
+<<<<<<< HEAD
+=======
+baseurl=https://raw.githubusercontent.com/MatMoul/archfi/master
+>>>>>>> src
--chroot) chroot=1
command=$2
args=$3;;