Resolve .gitignore merge conflict - keep custom configuration for selective file inclusion

dfe029bb · Yuhaibo · c6c63ba5 · fa7f32f7 · dfe029bb
Commit dfe029bb authored Nov 25, 2025 by Yuhaibo
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletions

.gitignore .gitignore +2 -1

No files found.
--- a/.gitignore
+++ b/.gitignore
@@ -54,4 +54,4 @@ build/

 # 忽略配置文件中的敏感信息
 config/secrets.yaml
-config/private.yaml
+config/private.yaml
\ No newline at end of file