Merge remote-tracking branch 'origin/master'

# Conflicts: # snow3.php
0xJacky · Jan 1, 2017 · 6b1208e · 6b1208e
2 parents 16df491 + 5fc16b4
commit 6b1208e
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/snow3.php b/snow3.php
@@ -3,7 +3,11 @@
 Plugin Name: Snow3
 Plugin URI: https://jackyu.cn/projects/snow3
 Description: 3D效果的飘雪插件，移植 Typecho 版 Snow（作者：清馨雅致）
+<<<<<<< HEAD
 Version: 1.2
+=======
+Version: 1.1
+>>>>>>> origin/master
 Author: Jacky
 Author URI: https://jackyu.cn/
 License: GPL2