From 5f0023b6b4ae8f8c24b80db804e3455a6f6818e1 Mon Sep 17 00:00:00 2001
From: MatMoul <matmoul@gmail.com>
Date: Thu, 10 Jan 2019 23:12:03 +0100
Subject: [PATCH] Resolve merge conflict

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

diff --git a/archfi b/archfi
index 0e4abef..3808392 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.01.01.20.34.17 (GPLv3)"
-=======
 apptitle="Arch Linux Fast Install (archfi) - Version: 2019.01.10.23.04.13 (GPLv3)"
->>>>>>> src
 baseurl=https://raw.githubusercontent.com/MatMoul/archfi/master
 skipfont="0"