projects / soft / lpc122x / core / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f8f3ac2)
Well ... not really at ease with git yet
authorNathael Pajani <nathael.pajani@ed3l.fr>
Wed, 2 Sep 2015 12:04:31 +0000 (14:04 +0200)
committerNathael Pajani <nathael.pajani@ed3l.fr>
Tue, 8 Nov 2022 16:03:04 +0000 (17:03 +0100)
.gitignore patch | blob | history

diff --git a/.gitignore b/.gitignore
index 8101e45..92034fa 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -18,11 +18,6 @@
 *.zip
 *.svg
 *.dump
-<<<<<<< HEAD
 *.img
 *.bak
-=======
-.img
-.bak
->>>>>>> 399cd0d9bcc1ce24503839f20b5709fd0568a6a6
 tags
Core support for the lpc122x microcontroller from NXP