From: Jan Schneider <jan@horde.org>
Date: Thu, 9 Dec 2010 15:01:41 +0000 (+0100)
Subject: Fix merge conflict.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=8269b0fb257f41b2ce4b4bd75de3df32f0739cc6;p=horde.git

Fix merge conflict.
---

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'];
     }