resolved merge conflicts

1 files changed, 3 insertions, 3 deletions

diff --git a/make b/make
index b66a6c1..7836cb4 100755
--- a/make
+++ b/make
@@ -1,10 +1,10 @@
 #!/bin/bash
 
-dir=~/dotfiles
-olddir=~/dotfiles_old
+dir=~/Dropbox/dotfiles
+olddir=~/Dropbox/dotfiles_old
 
 # Files to sync
-files="vim mutt vifm bashrc zshrc xmodmap mynotes tmux.conf zathurarc offlineimaprc inputrc latexmkrc crontab krystle"
+files="vim mutt vifm bashrc zshrc xmodmap mynotes tmux.conf zathurarc offlineimaprc inputrc latexmkrc crontab gitconfig"
 
 rm -rf $olddir
 mkdir -p $olddir