From: Nathael Pajani <nathael.pajani@ed3l.fr>
Date: Tue, 11 Aug 2015 16:55:46 +0000 (+0200)
Subject: better this way to ignore all .img and .bak files
X-Git-Url: http://git.techno-innov.fr/?a=commitdiff_plain;h=c98fb8b26da54a29afada6953f4023f9b42aba61;p=soft%2Flpc122x%2Fcore

better this way to ignore all .img and .bak files
---

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