cleanup

chrisle · Mar 20, 2012 · b22bf3b · b22bf3b
1 parent fbcdaeb
commit b22bf3b
Showing 1 changed file with 32 additions and 0 deletions.
diff --git a/Gemfile.lock.orig b/Gemfile.lock.orig
@@ -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