summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authornamilsk <namilsk@namilsk.tech>2026-03-14 19:15:14 +0300
committernamilsk <namilsk@namilsk.tech>2026-03-14 19:17:16 +0300
commitbc8bc0c2e4fb09070d82aab1f922ef8160c66528 (patch)
treec7d36233840007a638bffe3ffa9e503325a51794 /.gitignore
parent7019867411cdca87b394f38dfc589958e09a2b73 (diff)
First minimal commit
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index ab951f8..f9c9940 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
# ---> Rust
# Generated by Cargo
# will have compiled files and executables
@@ -19,4 +20,3 @@ Cargo.lock
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
# and can be added to the global gitignore or merged into this file. For a more nuclear
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
-#.idea/