From 893066181c08cbd4444b35177fa02753afee44db Mon Sep 17 00:00:00 2001
From: Benjamin Bohard <bbohard@cadoles.com>
Date: Tue, 1 Mar 2016 11:44:10 +0100
Subject: [PATCH] =?UTF-8?q?Prise=20en=20compte=20d'un=20argument=20positio?=
 =?UTF-8?q?nnel=20pour=20restreindre=20la=20recherche=20des=20programmes?=
 =?UTF-8?q?=20=C3=A0=20compiler=20=C3=A0=20un=20r=C3=A9pertoire?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 programme.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/programme.sh b/programme.sh
index cca4382..5f15461 100755
--- a/programme.sh
+++ b/programme.sh
@@ -12,6 +12,7 @@ else
 	rep="$1"
 fi
 
+<<<<<<< HEAD
 function buildProg()
 {
 	directory="$1"