-# home
+# dotfiles
What you need to do on the new box is this:
$ cd $HOME
$ git init
+<<<<<<< HEAD
$ git remote add home https://github.com/jannikz/home.git
$ git fetch home master
$ git reset --hard home/master
+=======
+ $ git remote add origin https://github.com/jannikz/dotfiles.git
+ $ git branch -u origin/master
+ $ git fetch origin master
+ $ git reset --hard origin/master
+>>>>>>> db69933... Change repository name from home to dotfiles