Resolve conflicts in lib/gitlab/usage_data.rb

3396edce got reverted in a CE->EE merge: f4dd12eb.

Resolve conflicts in lib/gitlab/usage_data.rb
3396edce got reverted in a CE->EE merge: f4dd12eb.
fc0e8aed · Stan Hu · e6142470 · fc0e8aed
Commit fc0e8aed authored May 07, 2018 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

lib/gitlab/usage_data.rb lib/gitlab/usage_data.rb +0 -4

No files found.
--- a/lib/gitlab/usage_data.rb
+++ b/lib/gitlab/usage_data.rb
@@ -96,10 +96,6 @@ module Gitlab
            protected_branches: ProtectedBranch.count,
            releases: Release.count,
            remote_mirrors: RemoteMirror.count,
-<<<<<<< HEAD
-            services: Service.where(active: true).count,
-=======
->>>>>>> upstream/master
            snippets: Snippet.count,
            todos: Todo.count,
            uploads: Upload.count,