Fix merge and bump version

redradiant · Oct 5, 2010 · 2043723 · 2043723
1 parent 9cb6336
commit 2043723
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/lib/mogli/user.rb b/lib/mogli/user.rb
@@ -5,8 +5,7 @@ class User < Profile
     define_properties :first_name, :last_name, :link, :about, :birthday, :gender,
           :email, :website, :timezone, :updated_time, :verified, :political, 
           :relationship_status, :locale, :religion, :quotes
-
->>>>>>> ce16930... Added religion and quotes to User
+
     def self.recognize?(hash)
       !hash.has_key?("category")
     end

diff --git a/mogli.gemspec b/mogli.gemspec
@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'mogli'
-  s.version = '0.0.13'
+  s.version = '0.0.14'
   s.summary = "Open Graph Library for Ruby"
   s.description = %{Simple library for accessing the facebook Open Graph API}
   s.files = Dir['lib/**/*.rb']