summaryrefslogtreecommitdiff
path: root/README.org
diff options
context:
space:
mode:
authorChristian Cleberg <[email protected]>2026-02-03 17:37:45 -0600
committerChristian Cleberg <[email protected]>2026-02-03 17:37:45 -0600
commit837fd6cfa70c63813001cecae92fddecf507336c (patch)
treea0acd87a60f7ee6cd136d22ce7257e69556d3143 /README.org
parent98c0ddf12796d2c3e37f05a5820c6a1db5e63c45 (diff)
downloadccleberg-837fd6cfa70c63813001cecae92fddecf507336c.tar.gz
ccleberg-837fd6cfa70c63813001cecae92fddecf507336c.tar.bz2
ccleberg-837fd6cfa70c63813001cecae92fddecf507336c.zip
fix git errors
Diffstat (limited to 'README.org')
-rw-r--r--README.org6
1 files changed, 1 insertions, 5 deletions
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")