增加新文件

3d6e7091 · wangkr · b387552e · 3d6e7091
--- 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