From 2b848a35a7d8113d798c52f60683f3497c61bedc Mon Sep 17 00:00:00 2001
From: Zelong Kuang <zelongk@wasteproducer.home.arpa>
Date: Sat, 13 Dec 2025 22:43:55 +1100
Subject: [PATCH] Add gitignore

---
 .gitignore | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index a7f06de..a40ea75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,8 @@
 *.log
 tmp/
 
+<<<<<<< HEAD
+=======
+
+>>>>>>> 6231dc6 (Add gitignore)
 custom.el