From c2c8b329dee7a00cc9de5701dfe3eb229bb504db Mon Sep 17 00:00:00 2001
From: MatMoul <matmoul@gmail.com>
Date: Mon, 7 Dec 2015 01:26:11 +0100
Subject: [PATCH] bug

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

diff --git a/README.md b/README.md
index 70ecbc6..695295a 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,11 @@ 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 />