Mirrors/solarized
2
0
Fork 0
mirror of https://github.com/altercation/solarized synced 2024-11-22 03:33:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

merge conflict resolution

Browse source
This commit is contained in:
Trevor Bramble 2012-08-12 23:50:18 -07:00
commit 0c5fbc71bf
1 changed files with 62 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -36,8 +36,8 @@ Currently available in formats for (cf [screenshots](#screenshots) below):
### Editors & IDEs ### Editors & IDEs
* **Vim** by [me](https://github.com/altercation) (the Vim-only portion of Solarized is * **Vim** by [me](https://github.com/altercation) (the Vim-only portion of Solarized is
[available here][Vim Repository], for use with Pathogen, etc.). [available here](https://github.com/altercation/vim-colors-solarized), for use with
See also the [Vim README]. Pathogen, etc.). See also the [Vim README](http://ethanschoonover.com/solarized/vim-colors-solarized).
* **Emacs** courtesy of [Greg Pfeil](http://blog.technomadic.org) * **Emacs** courtesy of [Greg Pfeil](http://blog.technomadic.org)
([@sellout](http://twitter.com/sellout)) ([@sellout](http://twitter.com/sellout))
in the main repo and in a [standalone repository][Emacs Repository] in the main repo and in a [standalone repository][Emacs Repository]