fix conflicts

app/views/home/header.html

@@ -44,6 +44,7 @@ function log(o) {
 				-->
 				<li><a href="/index#download" target="#download" class="smooth-scroll">{{msg . "download"}}</a> </li>
 				<li><a href="/index#donate" target="#donate" class="smooth-scroll">{{msg . "donate"}}</a> </li>
+				<li><a id="leanoteBlog" href="{{.leaUrl}}/index" target="_blank" title="lea++, leanote博客平台" class="">lea++</a></li>
 				<li style="position: relative; margin-right: 3px;">
 					<a href="http://bbs.leanote.com" target="_blank" class="">{{msg . "discussion"}}</a>
 					<div class="red-circle" style=""></div>
@@ -107,4 +108,4 @@ function log(o) {
 		</ul>
 	</div>
 </div>
--->
+-->