Use new ActsAsRDFable release v0.5.0, which contains a bug fix for Ra…

…ils 7
ualbertalib · Jan 16, 2024 · e5b3aa8 · e5b3aa8
1 parent 492ab09
commit e5b3aa8
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/Gemfile b/Gemfile
@@ -19,11 +19,7 @@ gem 'active_link_to'
 gem 'simple_form'
 
 # RDF stuff
-<<<<<<< HEAD
 gem 'acts_as_rdfable', github: 'ualbertalib/acts_as_rdfable', tag: 'v0.5.0'
-=======
-gem 'acts_as_rdfable', github: 'ualbertalib/acts_as_rdfable', branch: 'fix-issue-with-singleton-class-in-rails-7'
->>>>>>> 44693108 (Update branch to use hotfix in ActsAsRDF gem)
 gem 'rdf', '~> 3.3.1'
 gem 'rdf-n3', '~> 3.3.0'
 gem 'rdf-vocab', '~> 3.3.0' # this gem changed predicate names without warning, be cautious and test with migrations