From de0bdac66b8358bb636e0e0360aaa82d3482179a Mon Sep 17 00:00:00 2001
From: KOUNOIKE <kounoike.yuusuke@gmail.com>
Date: Sat, 8 Dec 2018 19:53:32 +0900
Subject: [PATCH] fix inherit error

---
 src/main/scala/gitbucket/core/controller/ApiController.scala | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/scala/gitbucket/core/controller/ApiController.scala b/src/main/scala/gitbucket/core/controller/ApiController.scala
index 7e2ef3932..1cf08af2d 100644
--- a/src/main/scala/gitbucket/core/controller/ApiController.scala
+++ b/src/main/scala/gitbucket/core/controller/ApiController.scala
@@ -33,6 +33,7 @@ class ApiController
     with RepositoryCreationService
     with IssueCreationService
     with HandleCommentService
+    with MergeService
     with WebHookService
     with WebHookPullRequestService
     with WebHookIssueCommentService