1 files changed, 4 insertions, 0 deletions

diff --git a/.gitignore b/.gitignore
index 18143bb..a40e05f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # ---> Rust
 # Generated by Cargo
 # will have compiled files and executables
@@ -74,3 +75,6 @@ Module.symvers
 Mkfile.old
 dkms.conf
 
+=======
+/target
+>>>>>>> 9604555 (Updated README.md, started writing minimal required functions.)