From 26afeced692e417aa1c5d43f6d08e5d6cc71aec1 Mon Sep 17 00:00:00 2001
From: Franz Liedke <franz@develophp.org>
Date: Wed, 17 Jun 2015 01:27:44 +0200
Subject: [PATCH] Fix merge conflict

---
 framework/core/src/Api/Actions/Forum/ShowAction.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/framework/core/src/Api/Actions/Forum/ShowAction.php b/framework/core/src/Api/Actions/Forum/ShowAction.php
index 44a80ebbd..be92a6c5f 100644
--- a/framework/core/src/Api/Actions/Forum/ShowAction.php
+++ b/framework/core/src/Api/Actions/Forum/ShowAction.php
@@ -1,9 +1,8 @@
 <?php namespace Flarum\Api\Actions\Forum;
 
-use Flarum\Core\Models\Forum;
 use Flarum\Api\Actions\SerializeResourceAction;
 use Flarum\Api\JsonApiRequest;
-use Flarum\Api\JsonApiResponse;
+use Tobscure\JsonApi\Document;
 
 class ShowAction extends SerializeResourceAction
 {
@@ -19,10 +18,10 @@ class ShowAction extends SerializeResourceAction
      * response.
      *
      * @param \Flarum\Api\JsonApiRequest $request
-     * @param \Flarum\Api\JsonApiResponse $response
-     * @return \Flarum\Core\Models\Forum
+     * @param \Tobscure\JsonApi\Document $document
+     * @return array
      */
-    protected function data(JsonApiRequest $request, JsonApiResponse $response)
+    protected function data(JsonApiRequest $request, Document $document)
     {
         return app('flarum.forum');
     }