|
|
@@ -153,7 +153,6 @@ function ams_post_box_save( $post_id, $post ) {
|
|
|
global $tdaSlider; // TODO: remove this
|
|
|
|
|
|
$tdaSlider = array(
|
|
|
-<<<<<<< HEAD
|
|
|
"TdA2016" => array(
|
|
|
"url" => "https://ams.mmnx.de/wp-content/uploads/2016/11/",
|
|
|
"tag-der-architektur-2016-01.jpg",
|
|
|
@@ -172,9 +171,6 @@ $tdaSlider = array(
|
|
|
"tag-der-architektur-2016-14.jpg",
|
|
|
),
|
|
|
"TdA2015" => array(
|
|
|
-=======
|
|
|
- "TdA2015" => array(
|
|
|
->>>>>>> 28dd4cf5b95c1cbc59eae0697c57deea578e3494
|
|
|
"url" => "https://ams.mmnx.de/wp-content/uploads/2016/11/",
|
|
|
"tag-der-architektur-2015-01.jpg",
|
|
|
"tag-der-architektur-2015-02.jpg",
|
|
|
@@ -597,7 +593,6 @@ $tdaSlider = array(
|
|
|
"url" => "https://ams.mmnx.de/wp-content/uploads/2016/11/",
|
|
|
"lehrerfortbildung-2016-01.jpg",
|
|
|
"lehrerfortbildung-2016-02.jpg",
|
|
|
-<<<<<<< HEAD
|
|
|
"lehrerfortbildung-2016-03.jpg",
|
|
|
"lehrerfortbildung-2016-04.jpg",
|
|
|
"lehrerfortbildung-2016-05.jpg",
|
|
|
@@ -640,28 +635,6 @@ $tdaSlider = array(
|
|
|
"koop-waldparkschule-heidelberg-2015-28.jpg",
|
|
|
"koop-waldparkschule-heidelberg-2015-29.jpg"
|
|
|
),
|
|
|
-=======
|
|
|
- "lehrerfortbildung-2016-03.jpg"
|
|
|
- ),
|
|
|
- "TdA2016" => array(
|
|
|
- "url" => "https://ams.mmnx.de/wp-content/uploads/2016/11/",
|
|
|
- "tag-der-architektur-2016-01.jpg",
|
|
|
- "tag-der-architektur-2016-02.jpg",
|
|
|
- "tag-der-architektur-2016-03.jpg",
|
|
|
- "tag-der-architektur-2016-04.jpg",
|
|
|
- "tag-der-architektur-2016-05.jpg",
|
|
|
- "tag-der-architektur-2016-06.jpg",
|
|
|
- "tag-der-architektur-2016-07.jpg",
|
|
|
- "tag-der-architektur-2016-08.jpg",
|
|
|
- "tag-der-architektur-2016-09.jpg",
|
|
|
- "tag-der-architektur-2016-10.jpg",
|
|
|
- "tag-der-architektur-2016-11.jpg",
|
|
|
- "tag-der-architektur-2016-12.jpg",
|
|
|
- "tag-der-architektur-2016-13.jpg",
|
|
|
- "tag-der-architektur-2016-14.jpg",
|
|
|
- )
|
|
|
-
|
|
|
->>>>>>> 28dd4cf5b95c1cbc59eae0697c57deea578e3494
|
|
|
);
|
|
|
|
|
|
// [carousel id="TdA2016"]
|
