Resolve conflicts in spec/lib/gitlab/usage_data_spec.rb

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

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

Showing with 0 additions and 4 deletions

spec/lib/gitlab/usage_data_spec.rb spec/lib/gitlab/usage_data_spec.rb +0 -4

No files found.
--- a/spec/lib/gitlab/usage_data_spec.rb
+++ b/spec/lib/gitlab/usage_data_spec.rb
@@ -117,10 +117,6 @@ describe Gitlab::UsageData do
        protected_branches
        releases
        remote_mirrors
-<<<<<<< HEAD
-        services
-=======
->>>>>>> upstream/master
        snippets
        todos
        uploads