From 4c084fd2f2b62cef30c857e017abdc943156cc84 Mon Sep 17 00:00:00 2001
From: Nicolas Delaforge <nicolas.delaforge@mnemotix.com>
Date: Thu, 8 Jul 2021 10:16:07 +0200
Subject: [PATCH] initial import

---
 .gitignore | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 27e7582..4b327e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Logs
 logs
 *.log
@@ -103,6 +102,6 @@ dist
 
 # TernJS port file
 .tern-port
-=======
+
+# BOL Data
 /data/
->>>>>>> bac28e8... initial import