更新 .gitattributes

36b32ed9 · wangkr · 75818fd1 · 36b32ed9
--- a/.gitattributes
+++ b/.gitattributes
-/config/config.php merge=ours
-/webmain/model/loginModel.php merge=ours
-/webmain/webmainConfig.php merge=ours
-/.idea/ merge=ours
-<<<<<<< HEAD
-/images/OA二维码.png merge=ours
-=======
-/images/OA二维码.png merge=ours
->>>>>>> 54d3127f87cdef7cc1f3ab124f081dbc0ee0c411
+config/config.php merge=ours
+webmain/model/loginModel.php merge=ours
+webmain/webmainConfig.php merge=ours
+.idea/ merge=ours
+images/OA二维码.png merge=ours
+