errplane 0.0.5 → 0.0.6

data/lib/errplane/railtie.rb

@@ -15,18 +15,10 @@ module Errplane
         config.logger            ||= ::Rails.logger
         config.rails_environment ||= ::Rails.env
         config.rails_root        ||= ::Rails.root
-<<<<<<< HEAD
-        config.framework           = "Rails #{::Rails::VERSION::STRING}"
-=======
-<<<<<<< HEAD
-        config.framework           = "Rails #{::Rails::VERSION::STRING}"
-=======
         config.framework           = "Rails"
         config.framework_version   = ::Rails::VERSION::STRING
         config.language            = "Ruby"
         config.language_version    = RUBY_VERSION
->>>>>>> Add more configurability and some initial Sinatra support. Also add some Rails logging for debugging purposes.
->>>>>>> Add more configurability and some initial Sinatra support. Also add some Rails logging for debugging purposes.
       end
 
       if defined?(::ActionDispatch::DebugExceptions)

data/lib/errplane/version.rb

@@ -1,3 +1,3 @@
 module Errplane
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: errplane
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors: