Permalink
Browse files

cleanup

  • Loading branch information...
1 parent fbcdaeb commit b22bf3bd990fa4a3e47dc009f38873528b6b765e @vgololobov vgololobov committed Mar 20, 2012
Showing with 32 additions and 0 deletions.
  1. +32 −0 Gemfile.lock.orig
View
@@ -0,0 +1,32 @@
+PATH
+ remote: .
+ specs:
+<<<<<<< HEAD
+ gattica (0.5.1)
+=======
+ gattica (0.6.0)
+ gattica
+>>>>>>> upstream/master
+ hpricot
+ test-unit
+
+GEM
+ remote: http://rubygems.org/
+ specs:
+ hpricot (0.8.6)
+<<<<<<< HEAD
+ rake (0.9.2.2)
+=======
+>>>>>>> upstream/master
+ test-unit (2.4.5)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+<<<<<<< HEAD
+ rake
+=======
+ gattica!
+>>>>>>> upstream/master
+ test-unit

0 comments on commit b22bf3b

Please sign in to comment.