From 9a76a89ef9f6ef2cda129a97eb9447347d740e8f Mon Sep 17 00:00:00 2001
From: Aru Gyani <gyaniaru@gmail.com>
Date: Wed, 29 Apr 2026 19:26:40 -0400
Subject: [PATCH] Remove conflict markets from README

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

diff --git a/README.md b/README.md
index 7d5ed9e..4f44771 100644
--- a/README.md
+++ b/README.md
@@ -34,8 +34,6 @@ The plugin maintains two sections in the note:
 You do not have to add the headings yourself. They appear (and disappear) as
 soon as the relationships are present (or removed).
 
-<<<<<<< Updated upstream
-=======
 ## Settings
 
 | Setting | Default | Notes |
@@ -95,7 +93,6 @@ For development, `npm run dev` will watch and rebuild on save.
 * `npm test` runs the test suite (Vitest).
 * `npm run typecheck` runs TypeScript with no emit.
 
->>>>>>> Stashed changes
 ## License
 
 MIT