解决冲突

2016-04-29 20:31:31 +08:00 · 2016-04-29 20:31:31 +08:00 · 1cad1626e0
parent 483f99f401
commit 1cad1626e0
1 changed files with 3 additions and 1 deletions
--- a/app/helpers/application_helper.rb
+++ b/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