summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorAditya Naik2020-06-09 16:40:30 -0400
committerAditya Naik2020-06-09 16:40:30 -0400
commit5e598a70d53c070a3465493a9e926717243fb844 (patch)
treee7149c4f13ece6f81aeafe078e69278782e94752 /.gitignore
parentfbf82a1f79b607f6c33237078c7c9c36de36e130 (diff)
parentab6f8af31993a882adeeaefb83f00f607c16d9ee (diff)
Master merge
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index ca19639..6a8c4a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,4 +11,5 @@ uctrl-firmware.txt
*.o
*.bin
*~
-MDK-ARM/ \ No newline at end of file
+MDK-ARM/
+tmp.org \ No newline at end of file