Version 0.7.1

bg_az-counter.php

@@ -3,11 +3,7 @@
     Plugin Name: Bg Az-Counter 
     Plugin URI: https://bogaiskov.ru
     Description: Подсчет количества посещений страниц на базе stat.azbyka.ru
-<<<<<<< HEAD
     Version: 0.7
-=======
-    Version: 0.6
->>>>>>> origin/master
     Author: VBog
     Author URI: https://bogaiskov.ru 
 	License:     GPL2
@@ -42,11 +38,7 @@ if ( !defined('ABSPATH') ) {
 	die( 'Sorry, you are not allowed to access this page directly.' ); 
 }
 
-<<<<<<< HEAD
-define('BG_COUNTER_VERSION', '0.7.0');
-=======
-define('BG_COUNTER_VERSION', '0.6.1');
->>>>>>> origin/master
+define('BG_COUNTER_VERSION', '0.7.1');
 define('BG_COUNTER_LOG', dirname(__FILE__ ).'/bg_counter.log');
 define('BG_COUNTER_STAT_COUNTERS','https://stat.azbyka.ru/counters');
 define('BG_COUNTER_STAT_RAITING','https://stat.azbyka.ru/rating');