Resolve lib/api/services.rb

e34cc521 · Lin Jen-Shin · eea639e1 · e34cc521
Commit e34cc521 authored Jul 23, 2018 by Lin Jen-Shin
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
@@ -756,11 +756,8 @@ module API
      ExternalWikiService,
      FlowdockService,
      GemnasiumService,
-<<<<<<< HEAD
      GithubService,
-=======
      HangoutsChatService,
->>>>>>> upstream/master
      HipchatService,
      IrkerService,
      JiraService,