From da5e14d7612b86f9200eddf60befbdaeaa15ffec Mon Sep 17 00:00:00 2001
From: Angelo Fallaria <ba.fallaria@gmail.com>
Date: Mon, 14 Feb 2022 12:43:16 +0800
Subject: [PATCH] fix: remove git merge conflict markers

---
 src/config.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/config.rs b/src/config.rs
index fb0c60e..c604a19 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -1301,7 +1301,6 @@ super + {a-}
     {firefox, brave}";
         eval_invalid_config_test(contents, ParseError::UnknownSymbol(2))
     }
-<<<<<<< HEAD
 
     #[test]
     fn test_alias() -> std::io::Result<()> {