sprig-reap 0.0.7 → 0.0.8

data/lib/sprig/reap/version.rb

@@ -1,5 +1,5 @@
 module Sprig
   module Reap
-    VERSION = "0.0.7"
+    VERSION = "0.0.8"
   end
 end

data/spec/lib/sprig/reap/configuration_spec.rb

@@ -145,13 +145,14 @@ describe Sprig::Reap::Configuration do
     end
   end
 
-<<<<<<< HEAD
   describe "#logger" do
     it "initializes a new logger" do
       Logger.should_receive(:new)
 
       subject.logger
-=======
+    end
+  end
+
   describe "#omit_empty_attrs" do
     context "from a fresh configuration" do
       its(:omit_empty_attrs) { should == false }
@@ -175,7 +176,6 @@ describe Sprig::Reap::Configuration do
       before { subject.omit_empty_attrs = 'True' }
 
       its(:omit_empty_attrs) { should == true }
->>>>>>> Add an option to allow users to omit empty attributes from seed files (fix #9)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sprig-reap
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors: