删除 .gitattributes

60408556 · wangkr · e4e44565 · e4e44565
--- a/.gitattributes
+++ b/.gitattributes
-config/cache.php merge=ours
-config/admin.php merge=ours
-config/session.php merge=ours
-config/admin.php merge=ours
\ No newline at end of file