删除 .gitattributes

9233d723 · wangkr · 6bdffc90 · 6bdffc90
--- a/.gitattributes
+++ b/.gitattributes
-config/cache.php merge=ours
-config/admin.php merge=ours
-config/session.php merge=ours
-config/admin.php merge=ours