Resolve lib/api/commits.rb

Signed-off-by: Rémy Coutable <remy@rymai.me>

Resolve lib/api/commits.rb
Signed-off-by: Rémy Coutable <remy@rymai.me>
be9ee776 · Rémy Coutable · 21cfb759 · be9ee776
Commit be9ee776 authored Oct 04, 2018 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

lib/api/commits.rb lib/api/commits.rb +0 -4

No files found.
--- a/lib/api/commits.rb
+++ b/lib/api/commits.rb
@@ -114,11 +114,7 @@ module API

          Gitlab::WebIdeCommitsCounter.increment if find_user_from_warden

-<<<<<<< HEAD
-          present commit_detail, with: Entities::CommitDetail
-=======
          present commit_detail, with: Entities::CommitDetail, stats: params[:stats]
->>>>>>> upstream/master
        else
          render_api_error!(result[:message], 400)
        end