冲突

2019-10-25 10:02:27 +08:00 · 2019-10-25 10:02:27 +08:00 · 06827df1c8
parent 14d427aed1
commit 06827df1c8
1 changed files with 0 additions and 4 deletions
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@ -1,10 +1,6 @@
 <div class="navHomepage">
  <div class="navHomepageLogo fl">
-<<<<<<< HEAD
    <%=link_to image_tag("../images/logo_blue.png",width:"51px", height: "45px",class: "mt3"), home_path()%>
-=======
-    <%=link_to image_tag("../images/logo_blue.png",width:"51px", height: "45px",class: "mt3"), homes_path()%>
->>>>>>> dev-homepage-revision
  </div>
  <div class="fl">
    <ul>