From bc8bc0c2e4fb09070d82aab1f922ef8160c66528 Mon Sep 17 00:00:00 2001
From: namilsk <namilsk@namilsk.tech>
Date: Sat, 14 Mar 2026 19:15:14 +0300
Subject: First minimal commit

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.gitignore')

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/
-- 
cgit v1.2.3