Solved conflicts

Author: operez-ddgi

decidim-file_authorization_handler.gemspec

@@ -22,9 +22,9 @@ Gem::Specification.new do |s|
   s.add_dependency "decidim", ">= #{Decidim::FileAuthorizationHandler::VERSION}"
   s.add_dependency "decidim-admin", ">= #{Decidim::FileAuthorizationHandler::VERSION}"
   s.add_dependency "rails", ">= 5.2"
- 
-  s.add_development_dependency "decidim-dev", Decidim::FileAuthorizationHandler::VERSION
+
+  s.add_development_dependency "decidim-dev", ">= #{Decidim::FileAuthorizationHandler::VERSION}"
   s.add_development_dependency "faker"
-  s.add_development_dependency "letter_opener_web", ">= 1.3.4"
-  s.add_development_dependency "rspec"
+  s.add_development_dependency "letter_opener_web", "~> 1.3.3"
+  s.add_development_dependency "listen"
 end