From acf6f985283444288ab406e84d2e73033240ec46 Mon Sep 17 00:00:00 2001
From: 622eda98dfef6c4fdb84ccca <622eda98dfef6c4fdb84ccca@devide>
Date: Mon, 22 May 2023 11:07:31 +0000
Subject: [PATCH] Auto Commit

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

diff --git a/.gitignore b/.gitignore
index aa1467b..15928bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,6 @@
 node_modules
 .DS_Store
-<<<<<<< HEAD
 dist
-=======
->>>>>>> 8e27e4d91d171fdca6522f4297ff30d0fdedccd0
 dist-ssr
 *.local
 *-lock.yaml
-- 
GitLab