fix: remove git merge conflict markers

2 years ago · da5e14d761
parent 220d16d0b0
commit da5e14d761
1 changed files with 0 additions and 1 deletions
--- 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<()> {