Merge branch 'master' of https://github.com/uvaes/dotfiles

zshrc conflict

1 files changed, 1 insertions, 1 deletions

diff --git a/make b/make
index 2ece3d4..f8de537 100755
--- a/make
+++ b/make
@@ -4,7 +4,7 @@ dir=~/dotfiles
 olddir=~/dotfiles_old
 
 # Files to sync
-files="vim mutt vifm bashrc zshrc xmodmap mynotes tmux.conf zathurarc offlineimaprc"
+files="vim mutt vifm bashrc zshrc xmodmap mynotes tmux.conf zathurarc offlineimaprc inputrc"
 
 rm -rf $olddir
 mkdir -p $olddir