From 4ebe082c925fcb98e60eafe09af0549eca1474b8 Mon Sep 17 00:00:00 2001
From: Willi Junga <willi.junga@verdigado.com>
Date: Mon, 18 Jan 2021 10:56:32 +0100
Subject: [PATCH] Revert "removed calendar & press tab on campaign page"

This reverts commit 84b8389906530a19b6ef0098f3dce32be534abde.
---
 README.md              |  3 +++
 page-home-campaign.php | 24 ++++++++++++++++++++++++
 style.css              |  4 ++++
 3 files changed, 31 insertions(+)

diff --git a/README.md b/README.md
index d6552ef..f551bcc 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,7 @@ Instructions:
 
 ## Version Changes
 
+<<<<<<< HEAD
 ### V0.5
 
 
@@ -30,6 +31,8 @@ _Fr, 15.01.2021 09:05_
 
 * removed press & calendar
 
+=======
+>>>>>>> parent of 84b8389 (removed calendar & press tab on campaign page)
 ### V0.3
 
 
diff --git a/page-home-campaign.php b/page-home-campaign.php
index d9d892d..cc61a15 100644
--- a/page-home-campaign.php
+++ b/page-home-campaign.php
@@ -97,7 +97,31 @@ Template Name: Startseite - Kampagnen
 			
 			
     				</div>
+    				<h2><span>Termine</span></h2>
+    				<div class="tab clearfix">
+	    				
+	    				<?php echo do_shortcode('[wpcalendar anzahl="5" kat="kampagne"]'); ?>
+					</div>
 					
+					<h2><span>Presse</span></h2>
+    				<div class="tab clearfix">
+	    				
+						<?php wp_reset_query(); ?>
+
+    		
+					    
+						<?php 
+							$postsperpage = get_option('posts_per_page');		
+							query_posts('posts_per_page=7&ignore_sticky_posts=1&category_name=presse'); 
+							?>
+					    		
+    		
+    					<?php while ( have_posts() ) : the_post(); ?>
+					    	<?php get_template_part( 'content-list-small', get_post_format() ); ?>
+					    <?php endwhile; ?>	
+					   
+
+					</div>
 					
 
 					
diff --git a/style.css b/style.css
index af81356..a496bc3 100644
--- a/style.css
+++ b/style.css
@@ -5,7 +5,11 @@ Description: Child Theme fuer Aufwändiges Wordpress-Theme für den EInsatz von
 Author: Willi Junga
 Author URI: https://verdigado.com
 Template: Joseph-knows-best-master
+<<<<<<< HEAD
 Version: 0.5
+=======
+Version: 0.3
+>>>>>>> parent of 84b8389 (removed calendar & press tab on campaign page)
 Text Domain: jkb-child
 Tags: child, childtheme, child-theme, two-columns, green, right-sidebar, fluid-layout, custom-background, custom-header, custom-menu, custom-menu, theme-options, featured-images, storytelling
 License: GNU General Public License v3 or later