From 5d35a2dccac3c10089e25a8c4ba9ec0736d36922 Mon Sep 17 00:00:00 2001
From: MatMoul <matmoul@gmail.com>
Date: Sat, 2 Feb 2019 23:04:21 +0100
Subject: [PATCH] Merge conflict

---
 archfi | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/archfi b/archfi
index 810cf5d..844e573 100644
--- a/archfi
+++ b/archfi
@@ -12,11 +12,7 @@
 # referance : https://wiki.archlinux.org/index.php/Installation_guide
 
 
-<<<<<<< HEAD
 apptitle="Arch Linux Fast Install (archfi) - Version: 2019.02.02.22.57.49 (GPLv3)"
-=======
-apptitle="Arch Linux Fast Install (archfi) - Version: 2019.02.02.22.57.49 (GPLv3)"
->>>>>>> src
 baseurl=https://raw.githubusercontent.com/MatMoul/archfi/master
 skipfont="0"