Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix rebase fail in 152238b4cf.

This commit is contained in:
Guo Xiang Tan 2019-05-07 09:46:07 +08:00
parent 152238b4cf
commit 1e7c4592dc
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/seed_data/categories.rb
View File

@ -159,11 +159,7 @@ module SeedData
end end
def find_category(site_setting_name) def find_category(site_setting_name)
<<<<<<< HEAD
category_id = SiteSetting.get(site_setting_name) category_id = SiteSetting.get(site_setting_name)
=======
category_id = SiteSetting.public_send(site_setting_name)
>>>>>>> DEV: Prefer `public_send` over `send`.
Category.find_by(id: category_id) if category_id > 0 Category.find_by(id: category_id) if category_id > 0
end end