cmc/ccleberg

GitHub profile README

clone: git clone https://gitbay.org/cmc/ccleberg.git

837fd6cfa70c63813001cecae92fddecf507336c

unsigned

author: Christian Cleberg <hello@cleberg.net> · 2026-02-03T23:37:45Z

fix git errors

 README.org   |  6 +-----
 christian.el | 24 ++++--------------------
 2 files changed, 5 insertions(+), 25 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")
diff --git a/christian.el b/christian.el
index 5e497cd..6f07182 100644
--- a/christian.el
+++ b/christian.el
@@ -26,36 +26,20 @@
     (tor-url     . "http://sv3g2dlyvwyk2nvi3eeh55fcrpdvjlclhi6wwsx57cste6lwdjanzyyd.onion")
     (blog-posts  .
                  ((:date "2026-02-02"
-<<<<<<< HEAD
-                   :title "Emacs Carnival: “This Year, I Will...”"
-                   :date "https://cleberg.net/blog/emacs-carnival-2026-02-completion.html")
-                  (: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")
-                  (:date "2025-12-20"
-                   :title "Self-Hosting Guide: Home Assistant"
-                   :url "https://cleberg.net/blog/self-hosting-home-assistant.html")
-=======
-                         :title "Emacs Carnival: “This Year, I Will...”"
-                         :url "https://cleberg.net/blog/emacs-carnival-2026-01-this-year-i-will.html")
+                         :title "Emacs Carnival: “Completion”"
+                         :url "https://cleberg.net/blog/emacs-carnival-2026-02-completion.html")
                   (: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")
                   (:date "2025-12-20"
                          :title "Self-Hosting Guide: Home Assistant"
                          :url "https://cleberg.net/blog/self-hosting-home-assistant.html")
->>>>>>> ec4babd (add latest post)
                   (:date "2025-12-06"
-                   :title "Self‑Hosting Guide: Tor Websites"
-                   :url "https://cleberg.net/blog/self-hosting-tor.html")
+                          :title "Self‑Hosting Guide: Tor Websites"
+                          :url "https://cleberg.net/blog/self-hosting-tor.html")
                   (:date "2025-11-23"
-<<<<<<< HEAD
-                   :title "Practical Uses for AI in IT Audit"
-                   :url "https://cleberg.net/blog/it-audit-ai.html")))))
-=======
                           :title "Practical Uses for AI in IT Audit"
                           :url "https://cleberg.net/blog/it-audit-ai.html")))))
->>>>>>> ec4babd (add latest post)
 
 (defun christian/display-profile ()
   "Pretty‑print the profile in a *Help* buffer."