1 files changed, 6 insertions, 0 deletions

diff --git a/.gitignore b/.gitignore
index 9fa3b1b..e7fb81d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,8 @@
+<<<<<<< HEAD
+
+# Ignore build generated files
+build
+=======
 # Object files
 *.o
 *.ko
@@ -16,3 +21,4 @@
 *.exe
 *.out
 *.app
+>>>>>>> edd9e6670a145e3f41f34c4c6c1cfee44f61a2c7