spec/integration/riak/conflict_resolution_spec.rb in riak-client-2.2.0.pre1 vs spec/integration/riak/conflict_resolution_spec.rb in riak-client-2.2.0

@@ -55,10 +55,10 @@
         obj
       end
 
       subject.attempt_conflict_resolution
       subject.reload
-      
+
       expect(subject).to_not be_conflict
       expect(subject.data).to eq 100
 
     end