mal0/acidarchon-hub
1
0
Fork 0
Code Pull Requests Actions Releases Activity

new file: .gitattributes

Browse Source
This commit is contained in:
acidburnmonkey
2025-08-06 01:44:37 -04:00
parent dc859f15f2
commit 18b7f77284
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitattributes
+2
View File
@@ -0,0 +1,2 @@
# Never merge settings.py - always use branch version
settings.py merge=ours