From 66e33ef5212c22dfec0051aab0419917e8b1a3d2 Mon Sep 17 00:00:00 2001
From: Andrew Scott <git@acscott.dev>
Date: Thu, 30 Dec 2021 18:12:27 -0500
Subject: [PATCH] Fix rebase conflicts

---
 install.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/install.sh b/install.sh
index 6378eb5..ce320eb 100755
--- a/install.sh
+++ b/install.sh
@@ -25,6 +25,10 @@ cp -a $config_dir/dunst $backup/
 cp -a $config_dir/kitty $backup/
 cp -a $config_dir/nvim $backup/
 cp -a $config_dir/polybar $backup/
+<<<<<<< HEAD
+=======
+cp -a $config_dir/ranger $backup/
+>>>>>>> 4f3a112 (Fix rebase conflicts)
 cp -a $bin_dir $backup/
 
 # Delete current files and folders
@@ -39,6 +43,10 @@ rm -rf $config_dir/dunst
 rm -rf $config_dir/kitty
 rm -rf $config_dir/nvim
 rm -rf $config_dir/polybar
+<<<<<<< HEAD
+=======
+rm -rf $config_dir/ranger/
+>>>>>>> 4f3a112 (Fix rebase conflicts)
 rm -rf $bin_dir
 
 # Create HOME symlinks