a/dotfiles
1
0
Fork 0
mirror of https://codeberg.org/andyscott/dotfiles.git synced 2024-11-12 15:20:50 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fix rebase conflicts

Browse source
This commit is contained in:
Andrew Scott 2021-12-30 18:12:27 -05:00
parent 7b90bb9db3
commit 66e33ef521
Signed by: a
GPG key ID: 3EB62D0BBB8DB381
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
install.sh
View file

@ -25,6 +25,10 @@ cp -a $config_dir/dunst $backup/
cp -a $config_dir/kitty $backup/ cp -a $config_dir/kitty $backup/
cp -a $config_dir/nvim $backup/ cp -a $config_dir/nvim $backup/
cp -a $config_dir/polybar $backup/ cp -a $config_dir/polybar $backup/
<<<<<<< HEAD
=======
cp -a $config_dir/ranger $backup/
>>>>>>> 4f3a112 (Fix rebase conflicts)
cp -a $bin_dir $backup/ cp -a $bin_dir $backup/
# Delete current files and folders # Delete current files and folders
@ -39,6 +43,10 @@ rm -rf $config_dir/dunst
rm -rf $config_dir/kitty rm -rf $config_dir/kitty
rm -rf $config_dir/nvim rm -rf $config_dir/nvim
rm -rf $config_dir/polybar rm -rf $config_dir/polybar
<<<<<<< HEAD
=======
rm -rf $config_dir/ranger/
>>>>>>> 4f3a112 (Fix rebase conflicts)
rm -rf $bin_dir rm -rf $bin_dir
# Create HOME symlinks # Create HOME symlinks