From 164d453343bc52e99359b51dea3c10dc2aa9bcd3 Mon Sep 17 00:00:00 2001
From: Jacek Kryszyn <j.kryszyn@samsung.com>
Date: Mon, 21 Aug 2023 16:13:47 +0200
Subject: correct .gitignore

---
 .gitignore | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 128efc2..2f97c2b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,6 @@
 bin/
 .project
 .vscode/
-<<<<<<< HEAD
 build/
-=======
 *.o
 /lib/lib
->>>>>>> caeaf2b26983e18245146d2368c5718f08a21729
-- 
cgit v1.2.3