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 1/2] 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 />
 

From 8750a7774e3a8b4b64f377dddb13f06678b9f4f3 Mon Sep 17 00:00:00 2001
From: MatMoul <matmoul@gmail.com>
Date: Mon, 7 Dec 2015 01:41:51 +0100
Subject: [PATCH 2/2] New Release : 2015.12.07.01.41.41

---
 archdi  | 6 +++---
 version | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/archdi b/archdi
index d3647a3..b5020c6 100644
--- a/archdi
+++ b/archdi
@@ -12,8 +12,8 @@
 
 
 
-apptitle="Arch Linux Desktop Install (archdi) - Version: 2015.12.07.01.26.48 (GPLv3)"
-version="2015.12.07.01.26.48"
+apptitle="Arch Linux Desktop Install (archdi) - Version: 2015.12.07.01.41.41 (GPLv3)"
+version="2015.12.07.01.41.41"
 cachedir=~/.cache/archdi
 
 lastverurl1=http://archdi.sourceforge.net/version
@@ -139,7 +139,7 @@ while (( "$#" )); do
       liburl1=https://raw.githubusercontent.com/MatMoul/archdi-pkg/$1/lib
       liburl2=https://raw.githubusercontent.com/MatMoul/archdi-pkg/$1/lib
       branchoption="$1"
-apptitle="Arch Linux Desktop Install (archdi) - Version: 2015.12.07.01.26.48 (GPLv3)"
+apptitle="Arch Linux Desktop Install (archdi) - Version: 2015.12.07.01.41.41 (GPLv3)"
     ;;
   esac
   shift
diff --git a/version b/version
index 07dbfc8..3195cf1 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2015.12.07.01.26.48
+2015.12.07.01.41.41