diff options
| author | Christian Cleberg <[email protected]> | 2026-02-03 17:37:45 -0600 |
|---|---|---|
| committer | Christian Cleberg <[email protected]> | 2026-02-03 17:37:45 -0600 |
| commit | 837fd6cfa70c63813001cecae92fddecf507336c (patch) | |
| tree | a0acd87a60f7ee6cd136d22ce7257e69556d3143 /christian.el | |
| parent | 98c0ddf12796d2c3e37f05a5820c6a1db5e63c45 (diff) | |
| download | ccleberg-837fd6cfa70c63813001cecae92fddecf507336c.tar.gz ccleberg-837fd6cfa70c63813001cecae92fddecf507336c.tar.bz2 ccleberg-837fd6cfa70c63813001cecae92fddecf507336c.zip | |
fix git errors
Diffstat (limited to 'christian.el')
| -rw-r--r-- | christian.el | 24 |
1 files changed, 4 insertions, 20 deletions
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." |