From ce34d922d70f1e6dff5d1db3edb09a7497b8d194 Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Wed, 17 Jun 2015 01:27:44 +0200 Subject: [PATCH] Fix merge conflict --- src/Api/Actions/Forum/ShowAction.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Api/Actions/Forum/ShowAction.php b/src/Api/Actions/Forum/ShowAction.php index 44a80ebbd..be92a6c5f 100644 --- a/src/Api/Actions/Forum/ShowAction.php +++ b/src/Api/Actions/Forum/ShowAction.php @@ -1,9 +1,8 @@