From: Jannik ZANDER <jzander@grundfos.com>
Date: Fri, 15 Dec 2017 10:40:40 +0000 (+0100)
Subject: Fix readme.md
X-Git-Url: https://git.zndr.dk/?a=commitdiff_plain;h=943e5dd06c758dde3d6b59015c779019507c0390;p=dotfiles.git

Fix readme.md
---

diff --git a/README.md b/README.md
index ae8de98..72886ce 100644
--- a/README.md
+++ b/README.md
@@ -3,15 +3,6 @@
 What you need to do on the new box is this:
 
     $ cd $HOME
-<<<<<<< 8b0d8fd23b8c07035b29b2f6e0a7db411d9d33b9
-    $ git init --bare $HOME/.cfg
-    $ alias cfg='git --git-dir=$HOME/.cfg --work-tree=$HOME'
-    $ cfg config --local status.showUntrackedFiles no
-    $ cfg remote add origin git@bitbucket.org:jannikz/dotfiles.git
-    $ cfg fetch
-    $ cfg reset --hard origin/master
-    $ cfg branch -u origin/master
-=======
     $ git init --bare $HOME/.gitdotfiles
     $ alias gdf='git --git-dir=$HOME/.gitdotfiles --work-tree=$HOME'
     $ gdf config --local status.showUntrackedFiles no
@@ -19,4 +10,3 @@ What you need to do on the new box is this:
     $ gdf fetch
     $ gdf reset --hard origin/master
     $ gdf branch -u origin/master
->>>>>>> Rename to gdf