From 0852633394bf05d0404839752ed9ecad131b6536 Mon Sep 17 00:00:00 2001
From: Yannick <contact@studio384.be>
Date: Sat, 14 Nov 2015 16:38:06 +0100
Subject: [PATCH] Fix merge issues

---
 backstage/about.php   | 20 --------------------
 include/functions.php |  6 +-----
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/backstage/about.php b/backstage/about.php
index 4b57278c8..8e519e507 100755
--- a/backstage/about.php
+++ b/backstage/about.php
@@ -28,27 +28,7 @@
 			<div class="panel-body">
 				<section class="release-notes">
 					<div class="container">
-<<<<<<< HEAD
 						<p class="meta"><span class="release-version">1.3 Preview 1</span></p><h2>Denim</h2>
-=======
-						<p class="meta"><span class="release-version">1.2.3</span></p><h2>Cornflower Blue Update 3</h2>
-						<ul class="changes">
-							<li><div class="change-label-container"><em class="change-label change-improved">Improved</em></div>Improved security on token hash</li>
-							<li><div class="change-label-container"><em class="change-label change-improved">Improved</em></div>Pruning forums will now also decrease the comment count</li>
-							<li><div class="change-label-container"><em class="change-label change-improved">Improved</em></div>General UI improvements in Backstage</li>
-							<li><div class="change-label-container"><em class="change-label change-fixed">Fixed</em></div>Fixes multiple issues with SQLite 3 support</li>
-							<li><div class="change-label-container"><em class="change-label change-fixed">Fixed</em></div>Fixes 5 other bugs</li>
-						</ul>
-					</div>
-					<div class="container">
-						<p class="meta"><span class="release-version">1.2.2</span></p><h2>Cornflower Blue Update 2</h2>
-						<ul class="changes">
-							<li><div class="change-label-container"><em class="change-label change-fixed">Fixed</em></div>Reissues the 1.2.1 update</li>
-						</ul>
-					</div>
-					<div class="container">
-						<p class="meta"><span class="release-version">1.2.1</span></p><h2>Cornflower Blue Update</h2>
->>>>>>> version1.2
 						<ul class="changes">
 							<li><div class="change-label-container"><em class="change-label change-new">New</em></div>Sixteen is a new default theme</li>
 							<li><div class="change-label-container"><em class="change-label change-new">New</em></div>You can now mark a thread as important</li>
diff --git a/include/functions.php b/include/functions.php
index 7da0074a8..020c04dc6 100755
--- a/include/functions.php
+++ b/include/functions.php
@@ -180,13 +180,9 @@ function prune($forum_id, $prune_pinned, $prune_date) {
 		while ($row = $db->fetch_row($result))
 			$comment_ids .= (($comment_ids != '') ? ',' : '').$row[0];
 
-<<<<<<< HEAD
 		if ($comment_ids != '') {
-=======
-		if ($post_ids != '') {
 			// Decrease the commentcount for users
-			decrease_post_counts($post_ids); 
->>>>>>> version1.2
+			decrease_comment_counts($post_ids); 
 			// Delete threads
 			$db->query('DELETE FROM '.$db->prefix.'threads WHERE id IN('.$thread_ids.')') or error('Unable to prune threads', __FILE__, __LINE__, $db->error());
 			// Delete subscriptions