dotfiles

commit ecb3ec029dbf1a535fd4fca1a3537aab38161370
parent 3d9f44f2964a811e66e117d458314c6781967aaa
Author: dudley <pyratebeard@gmail.com>
Date:   Wed,  5 Oct 2016 16:18:20 +0100

removed image

Diffstat:
M
README.md
 | 
5
-----

1 file changed, 0 insertions(+), 5 deletions(-)
diff --git a/README.md b/README.md
@@ -103,9 +103,4 @@ also thanks to [xero](https://github.com/xero/dotfiles) for having such well doc
 #disclaimer
 feel free to clone or fork my repo but you use these files at your own risk!
 
-<<<<<<< HEAD
-![](https://raw.githubusercontent.com/xero/dotfiles/master/previews/scrot_nightcity-5.png)
-- [color scripts](http://git.io/.fun)
-=======
 i will be happy to receive details of any bugs.
->>>>>>> refs/remotes/origin/master