dotfiles

commit 21bc65adf76a61552e5e58ad998f9644df3777b1
parent 9a19e359585302284c8e87788761a264ac7930e5
Author: pyratebeard <root@pyratebeard.net>
Date:   Thu, 15 Sep 2016 22:13:46 +0100

Merge remote-tracking branch 'refs/remotes/origin/master'

Diffstat:
M
README.md
 | 
8
++++++--
R
moc/config -> moc/.moc/config
 | 
0

R
moc/themes/algersoft_theme -> moc/.moc/themes/algersoft_theme
 | 
0

R
moc/themes/digitaljedi_theme -> moc/.moc/themes/digitaljedi_theme
 | 
0

R
moc/themes/orpheus_theme -> moc/.moc/themes/orpheus_theme
 | 
0

5 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
@@ -103,4 +103,9 @@ 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!
 
-i will be happy to receive details of any bugs.
-\ No newline at end of file
+<<<<<<< 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
diff --git a/moc/config b/moc/.moc/config
diff --git a/moc/themes/algersoft_theme b/moc/.moc/themes/algersoft_theme
diff --git a/moc/themes/digitaljedi_theme b/moc/.moc/themes/digitaljedi_theme
diff --git a/moc/themes/orpheus_theme b/moc/.moc/themes/orpheus_theme