github-migration
/
comicpress-2.8
1
0
Fork 0
Code Issues 17 Pull Requests Packages Projects Releases Wiki Activity

2.9.0.4 tagged ? 

Signed-off-by: Philip M. Hofer (Frumph) <frumph_dragon@yahoo.com>
This commit is contained in:
Philip M. Hofer (Frumph) 2009-12-01 13:57:06 -08:00
parent 459fe34713
commit aa9eaa0292
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
functions.php
View File

@ -75,9 +75,7 @@ function comicpress_load_options() {
global $comicpress_options;
$comicpress_options = get_option('comicpress_options');
if (empty($comicpress_options)) {
<<<<<<< .mine $comicpress_options['comicpress_version'] = '2.9.0.4';
======= $comicpress_options['comicpress_version'] = '2.9.0.4';
>>>>>>> .theirs
$comicpress_options['comicpress_version'] = '2.9.0.4';
foreach (array(
'disable_comic_frontpage' => false,
'disable_comic_blog_frontpage' => false,