Nggallery fix.

diff --git a/nggallery/album-glmalbums.php b/nggallery/album-glmalbums.php
index fa10dde..062c702 100644 (file)
--- a/nggallery/album-glmalbums.php
+++ b/nggallery/album-glmalbums.php
@@ -1,4 +1,3 @@
-<<<<<<< Updated upstream
 <?php
 /**
 Template Page for the album overview
@@ -14,12 +13,8 @@ Follow variables are useable :
  If you would like to show the timestamp of the image ,you can use <?php echo $exif['created_timestamp'] ?>
 **/
 ?>
-=======
->>>>>>> Stashed changes
 <?php if (!defined ('ABSPATH')) die ('No direct access allowed'); ?><?php if (!empty ($galleries)) : ?>
 <div class="ngg-albumoverview">
-<<<<<<< Updated upstream
-
     <!-- List of galleries -->
     <?php foreach ($galleries as $gallery) : ?>
 
@@ -37,22 +32,6 @@ Follow variables are useable :
             $max_width = '';
         } ?>
         <section class="album-meta-wrapper">
-=======
-    <?php foreach ($galleries as $gallery) : ?>
-        <div class="ngg-glmalbums small-6 medium-4 large-3">
-            <div class="ngg-album-compactbox">
-                <div class="ngg-album-link">
-                    <a class="Link" href="<?php echo nextgen_esc_url($gallery->pagelink) ?>">
-                        <img class="Thumb" alt="<?php echo esc_attr($gallery->title) ?>" src="<?php echo nextgen_esc_url($gallery->previewurl) ?>"/>
-                    </a>
-                </div>
-            </div>
-            <?php if (!empty($image_gen_params)) {
-                $max_width = 'style="max-width: ' . ($image_gen_params['width'] + 20) . 'px"';
-            } else {
-                $max_width = '';
-            } ?>
->>>>>>> Stashed changes
             <h4>
                 <a class="ngg-album-desc"
                    title="<?php echo esc_attr($gallery->title); ?>"
@@ -68,17 +47,9 @@ Follow variables are useable :
                     &nbsp;
                 <?php } ?>
             </p>
-<<<<<<< Updated upstream
         </section>
     </div>
     <?php endforeach; ?>
-=======
-
-        </div>
-
-    <?php endforeach; ?>
-
->>>>>>> Stashed changes
     <!-- Pagination -->
     <br class="ngg-clear"/>
     <?php echo $pagination ?>