summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorSteveAmor <SteveAmor@users.noreply.github.com>2022-01-02 22:27:43 (GMT)
committerSteveAmor <SteveAmor@users.noreply.github.com>2022-01-02 22:27:43 (GMT)
commitcc259b6a4ac93d507fa372a41ea653dedeb791ea (patch)
tree3c8b8b937b2b91149003195679ce5acda1154c4d /.gitignore
parent94561b233136334c7507925b04a345adb0e6c769 (diff)
parente0013e730448f4dc142e3610f970f22c807ac41e (diff)
resolves conflicts
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore4
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 39fb672..0474017 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,3 +43,7 @@ Testing/Temporary/
#VSCODE
.vscode/.cortex-debug.registers.state.json
.vscode/.cortex-debug.peripherals.state.json
+
+#build files
+src/nRF5_SDK_15.3.0_59ac345
+src/arm-none-eabi