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