From 70089266db5f1e1674012d34e70c3205aa7f7b47 Mon Sep 17 00:00:00 2001
From: Zai Santillan <zaisantillan14@gmail.com>
Date: Wed, 16 Nov 2022 13:08:50 +0800
Subject: [PATCH] chore: remove duplicate `.env`

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

diff --git a/.gitignore b/.gitignore
index cf0ee2d..fb89c69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,5 @@
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
-<<<<<<< HEAD
 .env
-=======
-.env 
->>>>>>> 849b92cd803993724dce307821dd54ef20d0bee2
 
 # dependencies
 /node_modules