lock

forestofthings · Feb 25, 2014 · bb362fb · bb362fb
1 parent 0593897
commit bb362fb
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -33,10 +33,6 @@ DEPENDENCIES
   rack
   rake
   rufus-lru
-<<<<<<< Updated upstream
   tabula-extractor (~> 0.7.2)
-=======
-  tabula-extractor (~> 0.7.2)!
->>>>>>> Stashed changes
   tilt
   warbler