解决冲突

app/helpers/application_helper.rb

@@ -3085,7 +3085,9 @@ def sort_by_sticky topics
 
   topics = tmpTopics
   return topics
-enddef strip_html(text,len=0,endss="...")
+end
+
+def strip_html(text,len=0,endss="...")
   ss = ""
   if text.length>0
     ss=text.gsub(/<\/?.*?>/, '').strip