summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorNamilskyy <alive6863@gmail.com>2025-11-25 20:41:21 +0300
committerNamilskyy <alive6863@gmail.com>2025-11-25 21:52:22 +0300
commitff6d45b66652a22856aa1fc8ecdee68de2e4a94c (patch)
tree7957717637d3f4e41f95802531b34d5f7426cb35 /.gitignore
parentc0b43f237e17a27220c915bcfa0f15c8cba880f4 (diff)
Cleaned git merge targs in .gitignore
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore4
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.)