Fix merge crap

Author: zackkatz

gravityview-az-filters.php

@@ -41,14 +41,10 @@ function gv_extension_az_entry_filtering_load() {
 	class GravityView_A_Z_Entry_Filter_Extension extends GravityView_Extension {
 
 		protected $_title = 'A-Z Filters';
-
-<<<<<<< HEAD
+		
 		protected $_version = '1.0.8';
-=======
-		protected $_version = '1.0.7';
 
 		protected $_item_id = 266;
->>>>>>> origin/develop
 
 		protected $_text_domain = 'gravityview-az-filters';
 

readme.txt

@@ -19,6 +19,7 @@ Alphabetically filter your entries by letters of the alphabet.
 = 1.0.8 on November 2, 2017 =
 * Fixed: WordPress 4.8.3 introduced breaking change
 * Updated translations: Turkish, Russian, Romanian, Portuguese (PT & BR), Dutch, German
+* Updated extension framework for improved auto-updates
 
 = 1.0.7 on September 28 =
 * Fixed: Fatal error when GravityView is disabled