From 569c630917fcc95426c6a824d396361bc0f75258 Mon Sep 17 00:00:00 2001
From: Madeleine Sydney <lomiskiam@gmail.com>
Date: Tue, 14 Jan 2025 22:01:13 -0700
Subject: [PATCH] tidy: Tidy readme

---
 README.org | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.org b/README.org
index 59a722a..eb8a53f 100755
--- a/README.org
+++ b/README.org
@@ -135,7 +135,6 @@ As with the rest of the config, these are largely adapted from Doom's ([cite:@li
 
 - ~syd-«NAME»-initialise~, where ~modules/«NAME» ∈ modules/*.el~ :: Instead of using top-level side-effects, (bar e.g. ~use-package~ invocations) should be wrapped in this kind of initialisation procedure.
 
->>>>>>> Conflict 1 of 1 ends
 * Tasks
 
 ** Begin setting up doomless Emacs