From ba4ce1ce885d68152b11a66fed039223aae58c07 Mon Sep 17 00:00:00 2001
From: Matthew Russell <mattrussell36@gmail.com>
Date: Mon, 27 Nov 2023 22:06:46 -0800
Subject: [PATCH] fix: botched merge in gitignore

---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 3fc3c1b9c..9cd427913 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,7 +52,6 @@ cypress.env.json
 /apps/**/cypress/reports/
 /apps/**/cypress/downloads/
 /apps/**/fixtures/wallet/node**
-<<<<<<< HEAD
 
 # apps/trading/e2e
 __pycache__/