Fixed after merge branches

cherry-plugin.php

@@ -1,7 +1,7 @@
 <?php
 /*
 	Plugin Name: Cherry Plugin
-	Version: 1.2.4
+	Version: 1.2.5
 	Plugin URI: http://www.cherryframework.com/update/meet-the-cherry-plugin-bare-functionalities-no-strings-attached/
 	Description: Cherry team has already created a Cherry framework that can be reasonably called perfect, but we are always looking for more improvements. Meet the Cherry Plugin. This is an extension for our Cherry framework where we've included all shortcodes and widgets you will ever need. The plugin is fully compatible with any WordPress theme powered by Cherry Framework. So far the plugin is a beta release, but we're going to keep on improving it, to deliver even more cool features.
 	Author: Cherry Team.
@@ -110,7 +110,6 @@ function cherry_plugin_uninstall(){
 		}
 		register_uninstall_hook(__FILE__, 'cherry_plugin_uninstall');
 	};
-
 /**
  * Not use `wptexturize` in content and excerpt.
  * Removed temporary.