From e5b3aa802f305dd3cb1bf7c92cb8644473040964 Mon Sep 17 00:00:00 2001
From: Shane Murnaghan <1930474+murny@users.noreply.github.com>
Date: Wed, 8 Nov 2023 10:00:39 -0700
Subject: [PATCH] Use new ActsAsRDFable release v0.5.0, which contains a bug
 fix for Rails 7

---
 Gemfile | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 56c2bdaf3..07dc3ac9e 100644
--- 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