From 9edfb29e2ca2e9cf891265d7c1e825aa0a137a40 Mon Sep 17 00:00:00 2001
From: Hsiao-Wei Wang <hsiaowei.eth@gmail.com>
Date: Tue, 9 Apr 2024 14:13:44 +0800
Subject: [PATCH] fix conflict

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

diff --git a/.gitignore b/.gitignore
index 23109dd28..91270239a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,10 +22,6 @@ tests/core/pyspec/eth2spec/bellatrix/
 tests/core/pyspec/eth2spec/capella/
 tests/core/pyspec/eth2spec/deneb/
 tests/core/pyspec/eth2spec/electra/
-<<<<<<< HEAD
-=======
-tests/core/pyspec/eth2spec/eip7549/
->>>>>>> dev
 tests/core/pyspec/eth2spec/whisk/
 tests/core/pyspec/eth2spec/eip7251/
 tests/core/pyspec/eth2spec/eip7594/