Fix rebase fail in 152238b4cf.

2019-05-07 09:46:07 +08:00 · 2019-05-07 09:46:07 +08:00 · 1e7c4592dc
parent 152238b4cf
commit 1e7c4592dc
1 changed files with 0 additions and 4 deletions
--- a/lib/seed_data/categories.rb
+++ b/lib/seed_data/categories.rb
@ -159,11 +159,7 @@ module SeedData
    end

    def find_category(site_setting_name)
-<<<<<<< HEAD
      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
    end