Resolve lib/api/services.rb

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

Resolve lib/api/services.rb
Signed-off-by: Rémy Coutable <remy@rymai.me>
bfcc9126 · Rémy Coutable · b9d4705d · bfcc9126
Commit bfcc9126 authored Aug 21, 2018 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

lib/api/services.rb lib/api/services.rb +0 -3

No files found.
--- a/lib/api/services.rb
+++ b/lib/api/services.rb
@@ -741,10 +741,7 @@ module API
      EmailsOnPushService,
      ExternalWikiService,
      FlowdockService,
-<<<<<<< HEAD
      GithubService,
-=======
->>>>>>> upstream/master
      HangoutsChatService,
      HipchatService,
      IrkerService,