Fix Conflict

2021-04-20 15:48:03 +08:00 · 2021-04-20 15:48:03 +08:00 · e7968638f8
parent 441dcb3e8a
commit e7968638f8
1 changed files with 0 additions and 4 deletions
--- a/clean_files.txt
+++ b/clean_files.txt
@ -105,11 +105,7 @@ aliases/available/vim.aliases.bash
 aliases/available/git.aliases.bash

 # tests
-<<<<<<< Updated upstream
 test/plugins/alias-completion.plugin.bats
-=======
-test/alias-completion.plugin.bats
->>>>>>> Stashed changes
 test/test_helper.bash

 # vendor init files