Remove merge conflict markers from ruby. Fixes #8.

2011-07-05 19:25:27 -03:00 · 2011-07-05 19:25:27 -03:00 · d2e0f8dc7e
commit d2e0f8dc7e
parent 1c0316a323
1 changed files with 0 additions and 1 deletions
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@ -559,4 +559,3 @@ snippet cfor
 	<% content_for :${1:head} do %>
 		${2}
 	<% end %>
->>>>>>> d46588cad4f48f1fe6f0e80c06b87f9b78792422