From: Nathael Pajani <nathael.pajani@ed3l.fr>
Date: Wed, 2 Sep 2015 12:04:31 +0000 (+0200)
Subject: Well ... not really at ease with git yet
X-Git-Url: http://git.techno-innov.fr/?a=commitdiff_plain;h=4d147753b3d187b984a34e2e09ea39b9ee2a218e;p=soft%2Flpc122x%2Fcore

Well ... not really at ease with git yet
---

diff --git a/.gitignore b/.gitignore
index 8101e45..92034fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,11 +18,6 @@
 *.zip
 *.svg
 *.dump
-<<<<<<< HEAD
 *.img
 *.bak
-=======
-.img
-.bak
->>>>>>> 399cd0d9bcc1ce24503839f20b5709fd0568a6a6
 tags