From b12c2704d0a1d9ea17cb7faf18f99bd4478821ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Pereira=20de=20Lucena?= Date: Fri, 21 Jul 2023 16:53:15 +0200 Subject: [PATCH] Fix bad conflict resolution --- decidim-core/spec/lib/webpacker/configuration_spec.rb | 2 -- decidim-core/spec/lib/webpacker/runner_spec.rb | 2 -- 2 files changed, 4 deletions(-) diff --git a/decidim-core/spec/lib/webpacker/configuration_spec.rb b/decidim-core/spec/lib/webpacker/configuration_spec.rb index 8a7541ebed7c..a33aba2aaedc 100644 --- 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 index 5a72b6559360..d5eadf84a8a6 100644 --- 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