From 837fd6cfa70c63813001cecae92fddecf507336c Mon Sep 17 00:00:00 2001
From: Christian Cleberg <hello@cleberg.net>
Date: Tue, 3 Feb 2026 17:37:45 -0600
Subject: fix git errors

---
 README.org | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'README.org')

diff --git a/README.org b/README.org
index 64a65c0..276372a 100644
--- a/README.org
+++ b/README.org
@@ -8,12 +8,8 @@
     (tor-url     . "http://sv3g2dlyvwyk2nvi3eeh55fcrpdvjlclhi6wwsx57cste6lwdjanzyyd.onion")
     (blog-posts  .
                  ((:date "2026-02-02"
-                         :title "Emacs Carnival: “This Year, I Will...”"
-<<<<<<< HEAD
+                         :title "Emacs Carnival: “Completion”"
                          :url "https://cleberg.net/blog/emacs-carnival-2026-02-completion.html")
-=======
-                         :url "https://cleberg.net/blog/emacs-carnival-2026-01-this-year-i-will.html")
->>>>>>> ec4babd (add latest post)
                   (:date "2026-01-31"
                          :title "Emacs Carnival: “This Year, I Will...”"
                          :url "https://cleberg.net/blog/emacs-carnival-2026-01-this-year-i-will.html")
-- 
cgit v1.2.3