aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--archfi4
1 files changed, 4 insertions, 0 deletions
diff --git a/archfi b/archfi
index 31eb053..f770247 100644
--- a/archfi
+++ b/archfi
@@ -13,10 +13,14 @@
<<<<<<< HEAD
+<<<<<<< HEAD
apptitle="Arch Linux Fast Install (archfi) - Version: 2016.03.30.21.44.09 (GPLv3)"
=======
apptitle="Arch Linux Fast Install (archfi) - Version: 2016.04.02.15.20.10 (GPLv3)"
>>>>>>> src
+=======
+apptitle="Arch Linux Fast Install (archfi) - Version: 2016.04.02.15.31.28 (GPLv3)"
+>>>>>>> src
baseurl=https://raw.githubusercontent.com/MatMoul/archfi/master