From c617fa9f3a5454c17c9b5b63273f8c5626ff61d8 Mon Sep 17 00:00:00 2001
From: Florijn Terstal <info@idspark.nl>
Date: Thu, 30 Apr 2015 13:25:05 +0200
Subject: [PATCH 1/3] Update mod_carousel.php  remove comments

when run it stops at the comments .. error...
---
 mod_carousel.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/mod_carousel.php b/mod_carousel.php
index 81a0934..86fddab 100644
--- a/mod_carousel.php
+++ b/mod_carousel.php
@@ -16,12 +16,8 @@
 //store params as object that we can loop through in tmpl/default.php
 $slideritems = new stdClass;
 
-<<<<<<< HEAD
-for ($i=1; $i <= 3; $i++) { 
-        $slideritems->$i = new stdClass;
-=======
+
 for ($i=1; $i <= 6; $i++) { 
->>>>>>> 6248772a906d6369fc6cafe301b56bd883689c50
 	$slideritems->$i->heading = $params->get("slide".$i."_heading");
 	$slideritems->$i->text = $params->get("slide".$i."_text");
 	$slideritems->$i->background_image = $params->get("slide".$i."_background_image");

From d8d42f25397784f874d96cc20d7844d73a108c2f Mon Sep 17 00:00:00 2001
From: Florijn Terstal <info@idspark.nl>
Date: Thu, 30 Apr 2015 13:28:56 +0200
Subject: [PATCH 2/3] update default.php  remove comments

the comments are display on the page
---
 tmpl/default.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tmpl/default.php b/tmpl/default.php
index c6de64d..c0ad125 100644
--- a/tmpl/default.php
+++ b/tmpl/default.php
@@ -57,4 +57,4 @@
           <span class="icon-next"></span>
         </a>
 </div>
->>>>>>> 6248772a906d6369fc6cafe301b56bd883689c50
+

From 3acef0f4a168c5759a2fc71c122b3a72874dd430 Mon Sep 17 00:00:00 2001
From: Florijn Terstal <info@idspark.nl>
Date: Thu, 30 Apr 2015 13:32:18 +0200
Subject: [PATCH 3/3] Update mod_carousel.php

---
 mod_carousel.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mod_carousel.php b/mod_carousel.php
index 86fddab..9e5ca9b 100644
--- a/mod_carousel.php
+++ b/mod_carousel.php
@@ -18,6 +18,7 @@
 
 
 for ($i=1; $i <= 6; $i++) { 
+	$slideritems->$i = new stdClass;
 	$slideritems->$i->heading = $params->get("slide".$i."_heading");
 	$slideritems->$i->text = $params->get("slide".$i."_text");
 	$slideritems->$i->background_image = $params->get("slide".$i."_background_image");