mirror of
https://codeberg.org/andyscott/dotfiles.git
synced 2024-12-22 18:03:11 -05:00
Fix rebase conflicts
This commit is contained in:
parent
bc9cc8b7ec
commit
3f957f8789
1 changed files with 8 additions and 0 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue