From e5a80aa013066c63cdb4204c4a08c6f5bfaf6708 Mon Sep 17 00:00:00 2001
From: leafus <nxtsrr@proton.me>
Date: Sun, 29 Sep 2024 19:33:21 +0200
Subject: [PATCH] Fix .gitignore

---
 .gitignore | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2f422a7..17507ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,3 @@
 .env
-<<<<<<< HEAD
 bin/*
-=======
-bin
->>>>>>> 454207d6ae18703f0d99f4d901a2d46c6d7164df
 s3-client*
\ No newline at end of file