From 5501c286af2f3947c2badda240e73286def0d550 Mon Sep 17 00:00:00 2001
From: Stephen Cresswell <229672+cressie176@users.noreply.github.com>
Date: Wed, 25 Dec 2024 08:44:51 +0000
Subject: [PATCH] Update README.md

---
 README.md | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/README.md b/README.md
index acacf6b..7da3815 100644
--- a/README.md
+++ b/README.md
@@ -37,13 +37,8 @@ Knuff works with JSON, but since it's so easy to convert YAML to JSON, and becau
 ```yaml
 # Creates a reminder in acuminous/foo repository at 08:00 on the 1st of July 2025
 
-<<<<<<< HEAD
-  # Optional. Must be unique. Will be generated from the title if omitted
-  # Used to avoid creating duplicate reminders in the issue tracking system
-=======
   # Optional. Must be unique. Generated from the title if omitted
   # Used to avoid creating multiple open issues for the same reminder
->>>>>>> 64c9738 (Improve documentation)
 - id: 'update-contentful-api-key'
 
   # Optional. Potentially useful for understanding the reminder's background