From b68d55f6883ac463a6be080f1b17bb12daed9fd9 Mon Sep 17 00:00:00 2001
From: "Philip M. Hofer (Frumph)" <frumph_dragon@yahoo.com>
Date: Sat, 28 Nov 2009 00:44:40 -0800
Subject: [PATCH] fix for comicpress-config.php

Signed-off-by: Philip M. Hofer (Frumph) <frumph_dragon@yahoo.com>
---
 comicpress-config.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/comicpress-config.php b/comicpress-config.php
index b7ca309..e21900b 100644
--- a/comicpress-config.php
+++ b/comicpress-config.php
@@ -4,9 +4,8 @@
 $comiccat = "3";
 
 //BLOG CATEGORY - the WordPress ID of your blog category (default "1")
-<<<<<<< .mine$blogcat = "4";
-=======$blogcat = "1";
->>>>>>> .theirs
+$blogcat = "1";
+
 //COMIC FOLDER - the folder your comics files are located in (default "comics")
 $comic_folder = "comics";