diff options
author | Chris Kempson <git@chriskempson.com> | 2016-08-30 08:28:43 +0100 |
---|---|---|
committer | Chris Kempson <git@chriskempson.com> | 2016-08-30 08:28:43 +0100 |
commit | 03b899b9cad9e45320f90054ec42636e6002fd0a (patch) | |
tree | 339268097a26a7df61bf94ae4b37c198320974c6 | |
parent | 1d53e28c92e1dca42dfdad9d0ce020dafa12b6b7 (diff) | |
parent | 18efe4c1c1a6b275c00eb08317ff731dd986d3ca (diff) |
Merge branch 'master' of https://github.com/atelierbram/base16-templates-source into atelierbram-master
Conflicts:
list.yaml
-rw-r--r-- | list.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -7,5 +7,5 @@ vim: https://github.com/chriskempson/base16-vim xfce4-terminal: https://github.com/afg984/base16-xfce4-terminal windows-command-prompt: https://github.com/iamthad/base16-windows-command-prompt xresources: https://github.com/chriskempson/base16-xresources -# Themes for `highlight` (http://www.andre-simon.de/doku/highlight/en/highlight.php) highlight: https://github.com/bezhermoso/base16-highlight +prism: https://github.com/atelierbram/base16-prism
\ No newline at end of file |