增加新文件

ba1122da · wangkr · d2eee4bb · ba1122da
--- a/.gitattributes
+++ b/.gitattributes
+config/cache.php merge=ours
+config/admin.php merge=ours
+config/session.php merge=ours
+config/admin.php merge=ours