From 56841bcfcf311e31498a824fd7151d8aabe8ed96 Mon Sep 17 00:00:00 2001
From: Diva M <divma@protonmail.com>
Date: Fri, 3 Mar 2023 14:31:33 -0500
Subject: [PATCH] fix gitignore

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

diff --git a/.gitignore b/.gitignore
index e29a92131..1e943347d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,8 +13,6 @@ genesis.ssz
 
 # IntelliJ
 /*.iml
-<<<<<<< HEAD
-
 # VSCode
 /.vscode
 .idea