From 18b7f7728408338a3230b5b2f65f9d4cc5764576 Mon Sep 17 00:00:00 2001
From: acidburnmonkey <acidburnmonkey@gmail.com>
Date: Wed, 6 Aug 2025 01:44:37 -0400
Subject: [PATCH] 	new file:   .gitattributes

---
 .gitattributes | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..55ce861
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+# Never merge settings.py - always use branch version
+settings.py merge=ours