fix forgotten conflict after rebase

PopulateTools · Jul 28, 2021 · aa050ed · aa050ed
1 parent 4b22aeb
commit aa050ed
Showing 1 changed file with 0 additions and 15 deletions.
diff --git a/app/models/site.rb b/app/models/site.rb
@@ -120,21 +120,6 @@ def gobierto_budgets_settings
                                    end
   end
 
-<<<<<<< HEAD
-  def gobierto_participation_settings
-    @gobierto_participation_settings ||= if configuration.available_module?("GobiertoParticipation") && configuration.gobierto_participation_enabled?
-                                           module_settings.find_by(module_name: "GobiertoParticipation")
-                                         end
-  end
-
-=======
-  def gobierto_citizens_charters_settings
-    @gobierto_citizens_charters_settings ||= if configuration.available_module?("GobiertoCitizensCharters") && configuration.gobierto_citizens_charters_enabled?
-                                               module_settings.find_by(module_name: "GobiertoCitizensCharters")
-                                             end
-  end
->>>>>>> da8ab6588 (update file & passing test)
-
   def gobierto_data_settings
     @gobierto_data_settings ||= if configuration.available_module?("GobiertoData") && configuration.gobierto_data_enabled?
                                   module_settings.find_by(module_name: "GobiertoData")