From 83bfb229e581e475cdd98b95de9701be8b784332 Mon Sep 17 00:00:00 2001
From: Romain Forlot <romain.forlot@iot.bzh>
Date: Thu, 1 Jun 2017 18:22:41 +0200
Subject: [PATCH] Update gitignore

Change-Id: I918ce2a6e99d1c517a3492d6cc9312bf333f94fa
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>

# Conflicts:
#	.gitignore
---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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
-- 
2.16.6