projects / tools / dynpart-tools.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6d09d75)
correct .gitignore
authorJacek Kryszyn <j.kryszyn@samsung.com>
Mon, 21 Aug 2023 14:13:47 +0000 (16:13 +0200)
committerJacek Kryszyn <j.kryszyn@samsung.com>
Mon, 21 Aug 2023 14:13:47 +0000 (16:13 +0200)
.gitignore patch | blob | history

diff --git a/.gitignore b/.gitignore
index 128efc21ce41761925112c3d8af2074cb2fb40bd..2f97c2b4761c825102444859a3f1bb12d6947476 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,6 @@
 bin/
 .project
 .vscode/
-<<<<<<< HEAD
 build/
-=======
 *.o
 /lib/lib
->>>>>>> caeaf2b26983e18245146d2368c5718f08a21729
Domain: System / Kernel