projects / soft / lpc122x / core / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 35fb02c)
better this way to ignore all .img and .bak files
authorNathael Pajani <nathael.pajani@ed3l.fr>
Tue, 11 Aug 2015 16:55:46 +0000 (18:55 +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 bfa9fd7..8101e45 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,11 @@
 *.zip
 *.svg
 *.dump
+<<<<<<< HEAD
+*.img
+*.bak
+=======
 .img
 .bak
+>>>>>>> 399cd0d9bcc1ce24503839f20b5709fd0568a6a6
 tags
Core support for the lpc122x microcontroller from NXP