Merge remote-tracking branch 'origin/master'

# Conflicts: # andrea/css/andrea.css # bruce/css/bootstrap-theme.css # bruce/css/bootstrap.css # bruce/css/bruce.css # classic/css/classic.css # community/css/community.css # ease/css/ease.css # favourite/css/favourite.css # finding/css/finding.css # i-nove/css/i-nove.css # metro-hot/css/metro-hot-responsive.css # metro-hot/css/metro-hot.css # neoease/css/neoease.css # owmx-3.0/css/owmx-3.0.css # timeline/css/timeline.css # tree-house/css/tree-house.css # yilia/css/yilia.css
2017-02-17 11:16:47 +08:00 · 2017-02-17 11:16:47 +08:00 · 4198ec0081
parent ab037d4ef9 5ec66867a9
commit 4198ec0081
78 changed files with 112 additions and 61 deletions
--- a/andrea/css/andrea.css
+++ b/andrea/css/andrea.css
@ -1,5 +1,6 @@
 /**
 * Copyright (c) 2010-2017, b3log.org & hacpai.com
+<<<<<<< HEAD
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -15,6 +16,8 @@
 */
 /**
 * Copyright (c) 2010-2016, b3log.org & hacpai.com
+=======
+>>>>>>> origin/master
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/andrea/lang/lang_en_US.properties
+++ b/andrea/lang/lang_en_US.properties
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/andrea/lang/lang_zh_CN.properties
+++ b/andrea/lang/lang_zh_CN.properties
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/andrea/skin.properties
+++ b/andrea/skin.properties
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/bruce/css/bootstrap-theme.css
+++ b/bruce/css/bootstrap-theme.css
@ -1,5 +1,6 @@
 /**
 * Copyright (c) 2010-2017, b3log.org & hacpai.com
+<<<<<<< HEAD
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -15,6 +16,8 @@
 */
 /**
 * Copyright (c) 2010-2016, b3log.org & hacpai.com
+=======
+>>>>>>> origin/master
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/bruce/css/bootstrap.css
+++ b/bruce/css/bootstrap.css
@ -1,5 +1,6 @@
 /**
 * Copyright (c) 2010-2017, b3log.org & hacpai.com
+<<<<<<< HEAD
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -15,6 +16,8 @@
 */
 /**
 * Copyright (c) 2010-2016, b3log.org & hacpai.com
+=======
+>>>>>>> origin/master
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/bruce/css/bruce.css
+++ b/bruce/css/bruce.css
@ -1,5 +1,6 @@
 /**
 * Copyright (c) 2010-2017, b3log.org & hacpai.com
+<<<<<<< HEAD
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -15,6 +16,8 @@
 */
 /**
 * Copyright (c) 2010-2016, b3log.org & hacpai.com
+=======
+>>>>>>> origin/master
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/bruce/js/bootstrap.js
+++ b/bruce/js/bootstrap.js
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016, b3log.org & hacpai.com
+ * Copyright (c) 2010-2017, b3log.org & hacpai.com
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/bruce/js/bootstrap.min.js
+++ b/bruce/js/bootstrap.min.js
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016, b3log.org & hacpai.com
+ * Copyright (c) 2010-2017, b3log.org & hacpai.com
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/bruce/lang/lang_en_US.properties
+++ b/bruce/lang/lang_en_US.properties
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/bruce/lang/lang_zh_CN.properties
+++ b/bruce/lang/lang_zh_CN.properties
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/bruce/skin.properties
+++ b/bruce/skin.properties
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/classic/css/classic.css
+++ b/classic/css/classic.css
@ -1,5 +1,6 @@
 /**
 * Copyright (c) 2010-2017, b3log.org & hacpai.com
+<<<<<<< HEAD
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -15,6 +16,8 @@
 */
 /**
 * Copyright (c) 2010-2016, b3log.org & hacpai.com
+=======
+>>>>>>> origin/master
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/classic/lang/lang_en_US.properties
+++ b/classic/lang/lang_en_US.properties
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/classic/lang/lang_zh_CN.properties
+++ b/classic/lang/lang_zh_CN.properties
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/classic/skin.properties
+++ b/classic/skin.properties
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/community/css/community.css
+++ b/community/css/community.css
@ -1,5 +1,6 @@
 /**
 * Copyright (c) 2010-2017, b3log.org & hacpai.com
+<<<<<<< HEAD
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -15,6 +16,8 @@
 */
 /**
 * Copyright (c) 2010-2016, b3log.org & hacpai.com
+=======
+>>>>>>> origin/master
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/community/lang/lang_en_US.properties
+++ b/community/lang/lang_en_US.properties
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/community/lang/lang_zh_CN.properties
+++ b/community/lang/lang_zh_CN.properties
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/community/skin.properties
+++ b/community/skin.properties
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/ease/css/ease.css
+++ b/ease/css/ease.css
@ -1,5 +1,6 @@
 /**
 * Copyright (c) 2010-2017, b3log.org & hacpai.com
+<<<<<<< HEAD
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -15,6 +16,8 @@
 */
 /**
 * Copyright (c) 2010-2016, b3log.org & hacpai.com
+=======
+>>>>>>> origin/master
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/ease/js/ease.js
+++ b/ease/js/ease.js
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016, b3log.org & hacpai.com
+ * Copyright (c) 2010-2017, b3log.org & hacpai.com
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/ease/js/ease.min.js
+++ b/ease/js/ease.min.js
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016, b3log.org & hacpai.com
+ * Copyright (c) 2010-2017, b3log.org & hacpai.com
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/ease/lang/lang_en_US.properties
+++ b/ease/lang/lang_en_US.properties
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/ease/lang/lang_zh_CN.properties
+++ b/ease/lang/lang_zh_CN.properties
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/ease/skin.properties
+++ b/ease/skin.properties
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/favourite/css/favourite.css
+++ b/favourite/css/favourite.css
@ -1,5 +1,6 @@
 /**
 * Copyright (c) 2010-2017, b3log.org & hacpai.com
+<<<<<<< HEAD
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -15,6 +16,8 @@
 */
 /**
 * Copyright (c) 2010-2016, b3log.org & hacpai.com
+=======
+>>>>>>> origin/master
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/favourite/lang/lang_en_US.properties
+++ b/favourite/lang/lang_en_US.properties
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/favourite/lang/lang_zh_CN.properties
+++ b/favourite/lang/lang_zh_CN.properties
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/favourite/skin.properties
+++ b/favourite/skin.properties
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/finding/css/finding.css
+++ b/finding/css/finding.css
@ -1,5 +1,6 @@
 /**
 * Copyright (c) 2010-2017, b3log.org & hacpai.com
+<<<<<<< HEAD
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -15,6 +16,8 @@
 */
 /**
 * Copyright (c) 2010-2016, b3log.org & hacpai.com
+=======
+>>>>>>> origin/master
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/finding/js/finding.js
+++ b/finding/js/finding.js
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016, b3log.org & hacpai.com
+ * Copyright (c) 2010-2017, b3log.org & hacpai.com
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/finding/js/finding.min.js
+++ b/finding/js/finding.min.js
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016, b3log.org & hacpai.com
+ * Copyright (c) 2010-2017, b3log.org & hacpai.com
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/finding/lang/lang_en_US.properties
+++ b/finding/lang/lang_en_US.properties
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/finding/lang/lang_zh_CN.properties
+++ b/finding/lang/lang_zh_CN.properties
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/finding/skin.properties
+++ b/finding/skin.properties
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/i-nove/css/i-nove.css
+++ b/i-nove/css/i-nove.css
@ -1,5 +1,6 @@
 /**
 * Copyright (c) 2010-2017, b3log.org & hacpai.com
+<<<<<<< HEAD
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -15,6 +16,8 @@
 */
 /**
 * Copyright (c) 2010-2016, b3log.org & hacpai.com
+=======
+>>>>>>> origin/master
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/i-nove/lang/lang_en_US.properties
+++ b/i-nove/lang/lang_en_US.properties
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/i-nove/lang/lang_zh_CN.properties
+++ b/i-nove/lang/lang_zh_CN.properties
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/i-nove/skin.properties
+++ b/i-nove/skin.properties
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/metro-hot/css/metro-hot-responsive.css
+++ b/metro-hot/css/metro-hot-responsive.css
@ -1,5 +1,6 @@
 /**
 * Copyright (c) 2010-2017, b3log.org & hacpai.com
+<<<<<<< HEAD
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -15,6 +16,8 @@
 */
 /**
 * Copyright (c) 2010-2016, b3log.org & hacpai.com
+=======
+>>>>>>> origin/master
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/metro-hot/css/metro-hot.css
+++ b/metro-hot/css/metro-hot.css
@ -1,5 +1,6 @@
 /**
 * Copyright (c) 2010-2017, b3log.org & hacpai.com
+<<<<<<< HEAD
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -15,6 +16,8 @@
 */
 /**
 * Copyright (c) 2010-2016, b3log.org & hacpai.com
+=======
+>>>>>>> origin/master
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/metro-hot/js/metro-hot.js
+++ b/metro-hot/js/metro-hot.js
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016, b3log.org & hacpai.com
+ * Copyright (c) 2010-2017, b3log.org & hacpai.com
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/metro-hot/js/metro-hot.min.js
+++ b/metro-hot/js/metro-hot.min.js
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016, b3log.org & hacpai.com
+ * Copyright (c) 2010-2017, b3log.org & hacpai.com
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/metro-hot/lang/lang_en_US.properties
+++ b/metro-hot/lang/lang_en_US.properties
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/metro-hot/lang/lang_zh_CN.properties
+++ b/metro-hot/lang/lang_zh_CN.properties
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/metro-hot/skin.properties
+++ b/metro-hot/skin.properties
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/mobile/js/l10n.js
+++ b/mobile/js/l10n.js
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016, b3log.org & hacpai.com
+ * Copyright (c) 2010-2017, b3log.org & hacpai.com
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/mobile/js/l10n.min.js
+++ b/mobile/js/l10n.min.js
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016, b3log.org & hacpai.com
+ * Copyright (c) 2010-2017, b3log.org & hacpai.com
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/mobile/lang/lang_en_US.properties
+++ b/mobile/lang/lang_en_US.properties
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/mobile/lang/lang_zh_CN.properties
+++ b/mobile/lang/lang_zh_CN.properties
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/mobile/skin.properties
+++ b/mobile/skin.properties
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/neoease/css/neoease.css
+++ b/neoease/css/neoease.css
@ -1,5 +1,6 @@
 /**
 * Copyright (c) 2010-2017, b3log.org & hacpai.com
+<<<<<<< HEAD
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -15,6 +16,8 @@
 */
 /**
 * Copyright (c) 2010-2016, b3log.org & hacpai.com
+=======
+>>>>>>> origin/master
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/neoease/js/neoease.js
+++ b/neoease/js/neoease.js
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016, b3log.org & hacpai.com
+ * Copyright (c) 2010-2017, b3log.org & hacpai.com
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/neoease/js/neoease.min.js
+++ b/neoease/js/neoease.min.js
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016, b3log.org & hacpai.com
+ * Copyright (c) 2010-2017, b3log.org & hacpai.com
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/neoease/lang/lang_en_US.properties
+++ b/neoease/lang/lang_en_US.properties
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/neoease/lang/lang_zh_CN.properties
+++ b/neoease/lang/lang_zh_CN.properties
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/neoease/skin.properties
+++ b/neoease/skin.properties
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/owmx-3.0/css/owmx-3.0.css
+++ b/owmx-3.0/css/owmx-3.0.css
@ -1,5 +1,6 @@
 /**
 * Copyright (c) 2010-2017, b3log.org & hacpai.com
+<<<<<<< HEAD
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -15,6 +16,8 @@
 */
 /**
 * Copyright (c) 2010-2016, b3log.org & hacpai.com
+=======
+>>>>>>> origin/master
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/owmx-3.0/lang/lang_en_US.properties
+++ b/owmx-3.0/lang/lang_en_US.properties
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/owmx-3.0/lang/lang_zh_CN.properties
+++ b/owmx-3.0/lang/lang_zh_CN.properties
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/owmx-3.0/skin.properties
+++ b/owmx-3.0/skin.properties
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/timeline/css/timeline.css
+++ b/timeline/css/timeline.css
@ -1,5 +1,6 @@
 /**
 * Copyright (c) 2010-2017, b3log.org & hacpai.com
+<<<<<<< HEAD
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -15,6 +16,8 @@
 */
 /**
 * Copyright (c) 2010-2016, b3log.org & hacpai.com
+=======
+>>>>>>> origin/master
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/timeline/js/timeline.js
+++ b/timeline/js/timeline.js
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016, b3log.org & hacpai.com
+ * Copyright (c) 2010-2017, b3log.org & hacpai.com
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/timeline/js/timeline.min.js
+++ b/timeline/js/timeline.min.js
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016, b3log.org & hacpai.com
+ * Copyright (c) 2010-2017, b3log.org & hacpai.com
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/timeline/lang/lang_en_US.properties
+++ b/timeline/lang/lang_en_US.properties
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/timeline/lang/lang_zh_CN.properties
+++ b/timeline/lang/lang_zh_CN.properties
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/timeline/skin.properties
+++ b/timeline/skin.properties
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/tree-house/css/tree-house.css
+++ b/tree-house/css/tree-house.css
@ -1,5 +1,6 @@
 /**
 * Copyright (c) 2010-2017, b3log.org & hacpai.com
+<<<<<<< HEAD
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -15,6 +16,8 @@
 */
 /**
 * Copyright (c) 2010-2016, b3log.org & hacpai.com
+=======
+>>>>>>> origin/master
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/tree-house/lang/lang_en_US.properties
+++ b/tree-house/lang/lang_en_US.properties
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/tree-house/lang/lang_zh_CN.properties
+++ b/tree-house/lang/lang_zh_CN.properties
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/tree-house/skin.properties
+++ b/tree-house/skin.properties
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/yilia/css/yilia.css
+++ b/yilia/css/yilia.css
@ -1,5 +1,6 @@
 /**
 * Copyright (c) 2010-2017, b3log.org & hacpai.com
+<<<<<<< HEAD
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -15,6 +16,8 @@
 */
 /**
 * Copyright (c) 2010-2016, b3log.org & hacpai.com
+=======
+>>>>>>> origin/master
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/yilia/js/yilia.js
+++ b/yilia/js/yilia.js
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016, b3log.org & hacpai.com
+ * Copyright (c) 2010-2017, b3log.org & hacpai.com
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/yilia/js/yilia.min.js
+++ b/yilia/js/yilia.min.js
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016, b3log.org & hacpai.com
+ * Copyright (c) 2010-2017, b3log.org & hacpai.com
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/yilia/lang/lang_en_US.properties
+++ b/yilia/lang/lang_en_US.properties
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/yilia/lang/lang_zh_CN.properties
+++ b/yilia/lang/lang_zh_CN.properties
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/yilia/skin.properties
+++ b/yilia/skin.properties
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.