From bbf7c04d4c51df37705a72b7c758103560279964 Mon Sep 17 00:00:00 2001
From: MatMoul <matmoul@gmail.com>
Date: Mon, 7 Dec 2015 01:41:31 +0100
Subject: [PATCH] Update README

---
 README.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/README.md b/README.md
index 695295a..70ecbc6 100644
--- a/README.md
+++ b/README.md
@@ -6,11 +6,7 @@ First, install Arch Linux with the official media and optionally with archfi.<br
 Look at archfi project to start your arch linux installation : https://github.com/MatMoul/archfi
 
 After reboot and your network ready, download the script :<br />
-<<<<<<< HEAD
 curl -L archdi.sf.net/archdi > archdi<br />
-=======
-curl -L archdi.sourceforge.net/archdi > archdi<br />
->>>>>>> 0d7f612ed8fdbba9ecd54359a7c77bfd79f7c2cf
 or if sourceforge is down :<br />
 curl -L matmoul.github.io/archdi > archdi<br />