From ea102c87a2f4c0de7b9b18c5ea59fa41adaf02c5 Mon Sep 17 00:00:00 2001
From: leca <leca@foxarmy.org>
Date: Sat, 14 Sep 2024 23:38:43 +0300
Subject: [PATCH] first commit

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

diff --git a/.gitignore b/.gitignore
index ab0fbe8..7fcc8fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # ---> Node
 # Logs
 logs
@@ -147,4 +146,3 @@ dist
 .externalNativeBuild
 .cxx
 local.properties
->>>>>>> 2733d8d (first commit)