aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-06-01 18:22:41 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2017-06-01 18:22:41 +0200
commit83bfb229e581e475cdd98b95de9701be8b784332 (patch)
tree6dc3ffb36a1a92c597867124e49a9fb867fbb054
parent8c2ba1ca1ccaeebb02645ee9a2e5dcd9559f517a (diff)
Update gitignore
Change-Id: I918ce2a6e99d1c517a3492d6cc9312bf333f94fa Signed-off-by: Romain Forlot <romain.forlot@iot.bzh> # Conflicts: # .gitignore
-rw-r--r--.gitignore3
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 03c0c866..a5f38503 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,5 +14,6 @@ configuration-generated.cpp
docs_doxygen
node_modules/
_book/
-CAN-binder/conf.d/packaging/
+packaging/
CAN-binder/package/
+compile_commands.json