reverting did not work..

README.md

@@ -16,14 +16,6 @@ Instructions:
 
 ## Version Changes
 
-<<<<<<< HEAD
-### V0.5
-
-
-_Mo, 18.01.2021 10:02_
-
-* changed divs in campagn page
-
 ### V0.4
 
 
@@ -31,8 +23,6 @@ _Fr, 15.01.2021 09:05_
 
 * removed press & calendar
 
-=======
->>>>>>> parent of 84b8389 (removed calendar & press tab on campaign page)
 ### V0.3
 
 

page-home-campaign.php

@@ -65,6 +65,22 @@ Template Name: Startseite - Kampagnen
 						</div>
 					</div>
 			</div>
+			
+			
+				<section id="content"><div class="inner wrap clearfix">	
+			
+				
+				
+				<div id="getinvolved">
+					<h2>Was wir wollen</h2>
+					
+					<div class="sidebar clearfix involvebar" role="complementary">
+					<?php dynamic_sidebar('campaignone'); ?>
+					</div>
+					
+				</div>	
+			
+
 			<div class="ninecol first clearfix" role="main">
 				<div class="responsive-tabs home-tabs">
 					
@@ -97,51 +113,13 @@ 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>
 					
 
 					
 					
 				</div>
 			</div>
-				<section id="content"><div class="inner wrap clearfix">	
-			
-				
-				
-				<div id="getinvolved">
-					<h2>Was wir wollen</h2>
-					
-					<div class="sidebar clearfix involvebar" role="complementary">
-					<?php dynamic_sidebar('campaignone'); ?>
-					</div>
-					
-				</div>	
-			
-
 			<script>jQuery(document).ready(function() { RESPONSIVEUI.responsiveTabs(); }) </script>
 			
 			<div id="sidebar1" class="sidebar threecol last clearfix homebar" role="complementary">

style.css

@@ -5,11 +5,7 @@ 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.4
-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