解决冲突

CHANGE_LOGS.html

@@ -14,6 +14,8 @@
             <li><a href="https://github.com/b3log/b3log-solo/issues/23">23 偏好设定关键参数校验</a></li>
             <li><a href="https://github.com/b3log/b3log-solo/issues/27">27 自定义导航后台链接问题</a></li>
             <li><a href="https://github.com/b3log/b3log-solo/issues/32">32 升级 FreeMarker 到 2.3.19</a></li>
+            <li><a href="https://github.com/b3log/b3log-solo/issues/34">34 升级 GAE SDK 到 1.7.0</a></li>
+            <li><a href="https://github.com/b3log/b3log-solo/issues/36">36 加入博客关键信息获取接口</a></li>
         </ul>
         <h2>Release 0.4.5 - Jun 1, 2012</h2>
         <ul>

core/src/main/java/org/b3log/solo/service/TagQueryService.java

@@ -102,7 +102,6 @@ public final class TagQueryService {
     }
 
     /**
-     >>>>>>> origin/0.4.6
      * Gets all tags.
      *
      * @return for example,

core/src/main/java/org/b3log/solo/util/Articles.java

@@ -131,7 +131,7 @@ public final class Articles {
         return true;
     }
 
-    /*
+    /**
      * Gets time of the recent updated article.
      * 
      * @return time of the recent updated article, returns {@code 0} if not found