This commit is contained in:
Chris Eppstein 2009-11-28 10:07:10 -08:00
parent 7b95f34aa3
commit d504650eda

4
lib/vendor/fssm.rb vendored
View File

@ -39,7 +39,3 @@ require 'fssm/monitor'
require "fssm/backends/#{FSSM::Support.backend.downcase}" require "fssm/backends/#{FSSM::Support.backend.downcase}"
FSSM::Backends::Default = FSSM::Backends.const_get(FSSM::Support.backend) FSSM::Backends::Default = FSSM::Backends.const_get(FSSM::Support.backend)
<<<<<<< HEAD:lib/vendor/fssm.rb
=======
>>>>>>> edge:lib/vendor/fssm.rb