Fix bad conflict resolution

decidim · Jul 24, 2023 · b12c270 · b12c270
1 parent f12553b
commit b12c270
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 4 deletions.
diff --git a/decidim-core/spec/lib/webpacker/configuration_spec.rb b/decidim-core/spec/lib/webpacker/configuration_spec.rb
@@ -51,8 +51,6 @@ module Webpacker
           expect(runtime_config["default"]["stylesheet_imports"].keys).to include("imports")
           expect(runtime_config["default"]["stylesheet_imports"]["imports"].keys).to include("app")
           expect(runtime_config["default"]["stylesheet_imports"]["imports"]["app"]).to include(
-            "stylesheets/decidim/elections/elections",
-            "stylesheets/decidim/votings/votings",
             "stylesheets/decidim/initiatives/initiatives"
           )
         end

diff --git a/decidim-core/spec/lib/webpacker/runner_spec.rb b/decidim-core/spec/lib/webpacker/runner_spec.rb
@@ -46,8 +46,6 @@ module Webpacker
         expect(runtime_config["default"]["stylesheet_imports"].keys).to include("imports")
         expect(runtime_config["default"]["stylesheet_imports"]["imports"].keys).to include("app")
         expect(runtime_config["default"]["stylesheet_imports"]["imports"]["app"]).to include(
-          "stylesheets/decidim/elections/elections",
-          "stylesheets/decidim/votings/votings",
           "stylesheets/decidim/initiatives/initiatives"
         )
       end