Ooops.
This commit is contained in:
parent
7b95f34aa3
commit
d504650eda
4
lib/vendor/fssm.rb
vendored
4
lib/vendor/fssm.rb
vendored
@ -39,7 +39,3 @@ require 'fssm/monitor'
|
||||
|
||||
require "fssm/backends/#{FSSM::Support.backend.downcase}"
|
||||
FSSM::Backends::Default = FSSM::Backends.const_get(FSSM::Support.backend)
|
||||
<<<<<<< HEAD:lib/vendor/fssm.rb
|
||||
=======
|
||||
|
||||
>>>>>>> edge:lib/vendor/fssm.rb
|
||||
|
Loading…
Reference in New Issue
Block a user