From 23e895b5a7e2468ac4ba24d7f2f3208b1f8cbe24 Mon Sep 17 00:00:00 2001
From: Matthew McKinnon <mmckinnon@comprofix.com>
Date: Mon, 11 Aug 2025 13:28:49 +1000
Subject: [PATCH] chore: upgrade to v7.3.1

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

diff --git a/Gemfile b/Gemfile
index 00a844d..50bc883 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,11 +2,7 @@
 
 source "https://rubygems.org"
 
-<<<<<<< HEAD
-gem "jekyll-theme-chirpy", "~> 7.3"
-=======
 gem "jekyll-theme-chirpy", "~> 7.3", ">= 7.3.1"
->>>>>>> v7.3.1
 
 gem "html-proofer", "~> 5.0", group: :test