Tagged 0.6.1

jnicklas · Jan 18, 2010 · e7b929c · e7b929c
1 parent 68b8237
commit e7b929c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/VERSION.yml b/VERSION.yml
@@ -1,4 +1,4 @@
 --- 
-:patch: 0
+:patch: 1
 :minor: 6
 :major: 0
diff --git a/feed_me.gemspec b/feed_me.gemspec
@@ -5,16 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{feed_me}
-  s.version = "0.6.0"
+  s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jonas Nicklas", "Jonathan Stott"]
   s.autorequire = %q{feed_me}
-<<<<<<< HEAD
   s.date = %q{2010-01-18}
-=======
-  s.date = %q{2010-01-15}
->>>>>>> 287138326c011e58d8ca1549037ac7f6f4f73aee
   s.description = %q{Nice and simple RSS and atom feed parsing built on hpricot}
   s.email = %q{jonas.nicklas@gmail.com}
   s.extra_rdoc_files = [