Merge pull request chrisle#23 from ngpestelos/master

bumps Gattica::VERSION to 0.6.2
vgololobov · Jan 19, 2013 · b91a644 · b91a644
2 parents 7f72555 + 8c5d8f6
commit b91a644
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 16 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,32 +1,20 @@
 PATH
   remote: .
   specs:
-<<<<<<< HEAD
-    gattica (0.5.1)
-=======
-    gattica (0.6.0)
-      gattica
->>>>>>> upstream/master
+    gattica (0.6.2)
       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
-=======
+  bundler
   gattica!
->>>>>>> upstream/master
+  hpricot
   test-unit
diff --git a/lib/gattica.rb b/lib/gattica.rb
@@ -25,7 +25,7 @@
 # Please see the README for usage docs.
 module Gattica
 
-  VERSION = '0.6.1'
+  VERSION = '0.6.2'
 
   # Creates a new instance of Gattica::Engine
   def self.new(*args)