summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacek Kryszyn <j.kryszyn@samsung.com>2023-08-21 16:13:47 +0200
committerJacek Kryszyn <j.kryszyn@samsung.com>2023-08-21 16:13:47 +0200
commit164d453343bc52e99359b51dea3c10dc2aa9bcd3 (patch)
treeda355ba802d07959ff1a0f6cd6d5744b70146e90
parent6d09d75c481f8149009f3e26e352da5b945fe4f2 (diff)
downloaddynpart-tools-164d453343bc52e99359b51dea3c10dc2aa9bcd3.tar.gz
dynpart-tools-164d453343bc52e99359b51dea3c10dc2aa9bcd3.tar.bz2
dynpart-tools-164d453343bc52e99359b51dea3c10dc2aa9bcd3.zip
correct .gitignore
-rw-r--r--.gitignore3
1 files changed, 0 insertions, 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