# Conflicts:
#	.github/workflows/test.yml
#	Appraisals
#	CHANGELOG.md
#	Gemfile
#	Gemfile.lock
#	README.md
#	app/assets/javascripts/decidim/decidim_awesome/awesome_map/legacy_map.js.es6
#	app/assets/javascripts/decidim/decidim_awesome/awesome_map/map.js.es6
#	app/awesome_overrides/presenters/decidim/proposals/proposal_presenter_override.rb
#	app/controllers/decidim/decidim_awesome/admin/constraints_controller.rb
#	app/helpers/decidim/decidim_awesome/map_helper.rb
#	gemfiles/decidim_0.21.gemfile.lock
#	gemfiles/decidim_0.22.gemfile.lock
#	gemfiles/decidim_0.23.2.gemfile.lock
#	gemfiles/decidim_0.23.gemfile.lock
#	lib/decidim/decidim_awesome/awesome_helpers.rb
#	lib/decidim/decidim_awesome/checksums.yml
#	lib/decidim/decidim_awesome/version.rb
#	spec/controllers/admin/config_controller_spec.rb
#	spec/controllers/admin/constraints_controller_spec.rb
#	spec/system/edit_proposals_spec.rb