删除 .gitattributes

6b3948cb · fengzy · 352ce478 · 352ce478
--- 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