summaryrefslogtreecommitdiff
path: root/README.org
diff options
context:
space:
mode:
authorChristian Cleberg <[email protected]>2026-02-03 17:36:16 -0600
committerChristian Cleberg <[email protected]>2026-02-03 17:36:16 -0600
commit98c0ddf12796d2c3e37f05a5820c6a1db5e63c45 (patch)
tree78a567edb5531b8c0eefb685452b1ad55907cb88 /README.org
parentec4babdffe75ff6bf7196237a7feecebd04876e2 (diff)
downloadccleberg-98c0ddf12796d2c3e37f05a5820c6a1db5e63c45.tar.gz
ccleberg-98c0ddf12796d2c3e37f05a5820c6a1db5e63c45.tar.bz2
ccleberg-98c0ddf12796d2c3e37f05a5820c6a1db5e63c45.zip
fix url
Diffstat (limited to 'README.org')
-rw-r--r--README.org4
1 files changed, 4 insertions, 0 deletions
diff --git a/README.org b/README.org
index 210229d..64a65c0 100644
--- a/README.org
+++ b/README.org
@@ -9,7 +9,11 @@
(blog-posts .
((:date "2026-02-02"
:title "Emacs Carnival: “This Year, I Will...”"
+<<<<<<< HEAD
+ :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")