summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorNamilskyy <alive6863@gmail.com>2025-11-24 23:04:25 +0300
committerNamilskyy <alive6863@gmail.com>2025-11-24 23:06:16 +0300
commit592000eb84dde8b15e776a1abcf72124aa0f200c (patch)
tree06d9164b49f60a4e584392a5b5b652341892371e /.gitignore
parent3ca328a876f7f4c8bf94c739d2166a1ad1dfb9bc (diff)
Updated README.md, started writing minimal required functions.
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore4
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.)