Fixes conflicts

hassox · Jun 21, 2008 · 862fd8d · 862fd8d
1 parent 9971a74
commit 862fd8d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 19 deletions.
diff --git a/spec/memcached_spec.rb b/spec/memcached_spec.rb
@@ -19,11 +19,7 @@
   end
 
   it "should respond to expire" do
-<<<<<<< HEAD:spec/memcached_spec.rb
-    @store.public_methods.should include("expire")
-=======
-    @store.public_methods.should include "expire!"
->>>>>>> bfbcd434aab315f569d05ea884cfdc0cef465425:spec/memcached_spec.rb
+    @store.public_methods.should include("expire!")
   end
 
   it "should store a key" do
@@ -39,13 +35,8 @@
   end
 
   it "should expire a key" do
-<<<<<<< HEAD:spec/memcached_spec.rb
-    @store.get('key').should eql("stored_data")
-    @store.expire('key')
-=======
     @store.get('key').should eql "stored_data"
     @store.expire!('key')
->>>>>>> bfbcd434aab315f569d05ea884cfdc0cef465425:spec/memcached_spec.rb
     @store.get('key').should be_nil
   end
 

diff --git a/spec/mintcache_store_spec.rb b/spec/mintcache_store_spec.rb
@@ -20,11 +20,7 @@
   end
 
   it "should respond to expire" do
-<<<<<<< HEAD:spec/mintcache_store_spec.rb
-    @store.public_methods.should include("expire")
-=======
     @store.public_methods.should include "expire!"
->>>>>>> bfbcd434aab315f569d05ea884cfdc0cef465425:spec/mintcache_store_spec.rb
   end
 
   it "should store a key" do
@@ -40,13 +36,8 @@
   end
 
   it "should expire a key" do
-<<<<<<< HEAD:spec/mintcache_store_spec.rb
-    @store.get('key').should eql("stored_data")
-    @store.expire('key')
-=======
     @store.get('key').should eql "stored_data"
     @store.expire!('key')
->>>>>>> bfbcd434aab315f569d05ea884cfdc0cef465425:spec/mintcache_store_spec.rb
     @store.get('key').should be_nil
   end