Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop

app/views/competitions/competitionsName.html.erb.html

@@ -8,7 +8,6 @@
         bottom: 0px;
         right: 0px;
     }
-ddd
 </style>
 <div class="educontent newLogipopup" id="backImg" >
     <div class="pr edu-txt-center height-100 pt110">
@@ -18,15 +17,6 @@ ddd
                 <img src="/images/educoder/competitionslog.png" height="600px" width="600px" />
                 <img height="600px" width="600px" src="/images/educoder/applys.png" />
             </div>
-            <!--第三方账号登录-->
-            <!--<div class="mt10 edu-txt-center">
-              <p class="color-grey-9">第三方账号登录</p>
-              <div class="mt15">
-                <a href="javascript:void(0)" class="margin15"><img src="/images/educoder/weixin.png" class="radius"/></a>
-                <a href="javascript:void(0)" class="margin15"><img src="/images/educoder/QQ.png" class="radius"/></a>
-                <a href="javascript:void(0)" class="margin15"><img src="/images/educoder/weibo.png" class="radius"/></a>
-              </div>
-            </div>-->
         </div>
     </div>
 </div>