diff options
author | Chris Kempson <git@chriskempson.com> | 2016-08-28 07:31:21 +0100 |
---|---|---|
committer | Chris Kempson <git@chriskempson.com> | 2016-08-28 07:31:21 +0100 |
commit | e464f90873e852a35c37238e4b4752075c9f7f63 (patch) | |
tree | 90229b2df44d371c94c32e4a9d0d0ca9b037aa1a /.gitattributes | |
parent | 61c7970d4f8364c71a4c94a97d6dad43b43426a4 (diff) | |
parent | cdb762302adfd95b81d35b661231ed8afd59fd6d (diff) |
Merge branch 'patch-1' of https://github.com/joshwlewis/base16-schemes-source into joshwlewis-patch-1
Conflicts:
list.yaml
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions