From: Jacek Kryszyn <j.kryszyn@samsung.com>
Date: Mon, 21 Aug 2023 14:13:47 +0000 (+0200)
Subject: correct .gitignore
X-Git-Tag: accepted/tizen/unified/20240503.021853~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=164d453343bc52e99359b51dea3c10dc2aa9bcd3;p=tools%2Fdynpart-tools.git

correct .gitignore
---

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