1 files changed, 4 insertions, 0 deletions
diff --git a/archfi b/archfi
index b12f43c..31eb053 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.03.30.21.44.09 (GPLv3)"
+=======
 apptitle="Arch Linux Fast Install (archfi) - Version: 2016.04.02.15.20.10 (GPLv3)"
+>>>>>>> src
 baseurl=https://raw.githubusercontent.com/MatMoul/archfi/master