Fixed conflicts from the merging.

GavickPro · Jul 8, 2013 · 3b6188a · 3b6188a
1 parent bba491a
commit 3b6188a
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 11 deletions.
diff --git a/MeetGavernWP/gavern/config/en_US/template.json b/MeetGavernWP/gavern/config/en_US/template.json
@@ -2,13 +2,8 @@
 	"template": {
 		"name": "MeetGavernWP",
 		"update_name": "gk_meetgavern_wp",
-<<<<<<< HEAD
-		"date": "07/03/2013",
-		"version": "1.6.3",
-=======
 		"date": "05/07/2013",
 		"version": "1.7",
->>>>>>> GavernWP-1.7
 		"description": "Free GavickPro Wordpress theme based on the GavernWP framework"
 	},
 	"developer_config": {

diff --git a/MeetGavernWP/gavern/widgets.nsp.php b/MeetGavernWP/gavern/widgets.nsp.php
@@ -955,15 +955,9 @@ function generate_art_image($i) {
 		 			}
 
 		 			if($this->wdgt_config['article_image_pos'] == 'left' && $this->wdgt_config['article_image_order'] == 1) {
-<<<<<<< HEAD
-		 				return '<div class="gk-nsp-image-wrap"><a href="'.$art_url.'" class="gk-image-link"><img src="'.$new_path.'" alt="" class="gk-nsp-image" '.$style.' width="'.$this->wdgt_config['article_image_w'].'" height="'.$this->wdgt_config['article_image_h'].'" /></a></div>';
-		 			} else {
-		 				return '<a href="'.$art_url.'" class="gk-responsive gk-image-link"><img src="'.$new_path.'" alt="" class="gk-nsp-image gk-responsive" '.$style.' width="'.$this->wdgt_config['article_image_w'].'" height="'.$this->wdgt_config['article_image_h'].'" /></a>';
-=======
 		 				return apply_filters('gk_nsp_art_image', '<div class="gk-nsp-image-wrap"><a href="'.$art_url.'" class="gk-image-link"><img src="'.$new_path.'" alt="" class="gk-nsp-image" '.$style.' /></a></div>');
 		 			} else {
 		 				return apply_filters('gk_nsp_art_image', '<a href="'.$art_url.'" class="gk-responsive gk-image-link"><img src="'.$new_path.'" alt="" class="gk-nsp-image gk-responsive" '.$style.' /></a>');
->>>>>>> GavernWP-1.7
 		 			}
 	 			} else {
 	 				return __('An error occured during creating the thumbnail.', GKTPLNAME);