增加新文件

e1d7be11 · wangkr · a02eafeb · e1d7be11
--- 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