vim/vim-snippets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove merge conflict markers from ruby. Fixes #8.

Browse Source
This commit is contained in:
Honza Pokorny 2011-07-05 19:25:27 -03:00
parent 1c0316a323
commit d2e0f8dc7e
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
snippets/ruby.snippets
View File

@ -559,4 +559,3 @@ snippet cfor
<% content_for :${1:head} do %> <% content_for :${1:head} do %>
${2} ${2}
<% end %> <% end %>
>>>>>>> d46588cad4f48f1fe6f0e80c06b87f9b78792422