更新 .gitattributes

59e83b8b · wangkr · 734883c5 · 734883c5 · 59e83b8b
--- a/.gitattributes
+++ b/.gitattributes
-/config/config.php merge=ours
-/webmain/model/loginModel.php merge=ours
-/webmain/webmainConfig.php merge=ours
-/.idea/ merge=ours
-/images/OA二维码.png merge=ours
--- a/.gitattributes
+++ b/.gitattributes
+config/config.php merge=ours
+webmain/model/loginModel.php merge=ours
+webmain/webmainConfig.php merge=ours
+.idea/ merge=ours
+images/OA二维码.png merge=ours