Permalink
Browse files

Removed a stray conflict marker that had snuck in.

  • Loading branch information...
srushti committed Jul 26, 2012
1 parent 69ec09e commit f53860500819f8423ab8562bc1201681bb77cf9a
Showing with 0 additions and 1 deletion.
  1. +0 −1 README.md
View
@@ -140,7 +140,6 @@ Expand CSS selectors `div.event` in to markup `<div class='event'></div>`
http://net.tutsplus.com/articles/general/quick-tip-even-quicker-markup-with-sparkup/
->>>>>>> Modified README
### fugitive
Git integration

0 comments on commit f538605

Please sign in to comment.