From 06827df1c87ce1dfa3a89c90221525abb51a8856 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Fri, 25 Oct 2019 10:02:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_logined_header.html.erb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index c421149c0..0c9417823 100644
--- 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>