From 8269b0fb257f41b2ce4b4bd75de3df32f0739cc6 Mon Sep 17 00:00:00 2001 From: Jan Schneider Date: Thu, 9 Dec 2010 16:01:41 +0100 Subject: [PATCH] Fix merge conflict. --- jonah/stories/share.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/jonah/stories/share.php b/jonah/stories/share.php index 4c740a67f..c4d3b2527 100644 --- a/jonah/stories/share.php +++ b/jonah/stories/share.php @@ -95,13 +95,8 @@ if ($form->validate($vars)) { $channel = $GLOBALS['injector']->getInstance('Jonah_Driver')->getChannel($channel_id); if (empty($channel['channel_story_url'])) { -<<<<<<< HEAD $story_url = Horde::url('stories/view.php', true); $story_url = Horde_Util::addParameter($story_url, array('channel_id' => '%c', 'id' => '%s')); -======= - $story_url = Horde::url('stories/view.php', true); - $story_url = Horde_Util::addParameter($story_url, array('channel_id' => '%c', 'story_id' => '%s')); ->>>>>>> master } else { $story_url = $channel['channel_story_url']; } -- 2.11.0