XorA
/
bash-it
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Conflict

pull/1872/head
John Fred Fadrigalan 2021-04-20 15:48:03 +08:00
parent 441dcb3e8a
commit e7968638f8
No known key found for this signature in database
GPG Key ID: 4C23960F72FC911F
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clean_files.txt
View File

@ -105,11 +105,7 @@ aliases/available/vim.aliases.bash
aliases/available/git.aliases.bash aliases/available/git.aliases.bash
# tests # tests
<<<<<<< Updated upstream
test/plugins/alias-completion.plugin.bats test/plugins/alias-completion.plugin.bats
=======
test/alias-completion.plugin.bats
>>>>>>> Stashed changes
test/test_helper.bash test/test_helper.bash
# vendor init files # vendor init files