From e7968638f8604ef1c7461c3d6c3c780dba56e509 Mon Sep 17 00:00:00 2001
From: John Fred Fadrigalan <johnfred.fadrigalan@hotmail.com>
Date: Tue, 20 Apr 2021 15:48:03 +0800
Subject: [PATCH] Fix Conflict

---
 clean_files.txt | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/clean_files.txt b/clean_files.txt
index b39ec66b..1d64c681 100644
--- 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