Permalink
Browse files

renamed .graffle file; change README

  • Loading branch information...
1 parent 52c0376 commit c2eed5e17e24101190504db5551278328719b450 @LevelbossMike committed Apr 2, 2011
View
@@ -1,15 +1,6 @@
-<<<<<<< HEAD
-A vim cheat sheet wallpaper based on a wallpaper by [Ted Naleid](http://naleid.com/blog/2010/10/04/vim-movement-shortcuts-wallpaper/). Colors are based on [solarized](https://github.com/altercation/solarized) which makes looking at it even more aaaawesome. If you are using MacVim I suggest you set
-=======
-A vim cheat sheet wallpaper based on a wallpaper by [Ted Naleid](http://naleid.com/blog/2010/10/04/vim-movement-shortcuts-wallpaper/). Colors are based on which makes looking at it even more awesome. If you are using MacVim I suggest you set
->>>>>>> c3627ad5ae4fe2488fe8269b7fd421a56c868422
-your background transparent and you will be able to see the cheat sheet
+A vim cheat sheet wallpaper based on a wallpaper by [Ted Naleid](http://naleid.com/blog/2010/10/04/vim-movement-shortcuts-wallpaper/). Colors are based on [solarized](https://github.com/altercation/solarized) which makes looking at it even more aaaawesome. If you are using MacVim I suggest you set your background transparent and you will be able to see the cheat sheet
while editing. Set it something between 10-20 percent and you
should be fine. For example:
:set transparency=15
-<<<<<<< HEAD
This wallpaper should 'work' with both the dark and the light theme of [solarized](https://github.com/altercation/solarized). OmniGraffle files are included if you feel like customizing this to your own vim colorscheme.
-=======
-
->>>>>>> c3627ad5ae4fe2488fe8269b7fd421a56c868422

0 comments on commit c2eed5e

Please sign in to comment.