Resolves usage-data conflicts

lib/gitlab/usage_data.rb

@@ -25,7 +25,6 @@ module Gitlab
           active_user_count: User.active.count,
           recorded_at: Time.now,
           mattermost_enabled: Gitlab.config.mattermost.enabled,
-<<<<<<< HEAD
           edition: 'EE'
         }
 
@@ -43,11 +42,6 @@ module Gitlab
           usage_data[:license_add_ons] = license.add_ons
         end
 
-=======
-          edition: 'CE'
-        }
-
->>>>>>> ce-com/master
         usage_data
       end
 
@@ -96,7 +90,6 @@ module Gitlab
         }
       end
 
-<<<<<<< HEAD
       def service_desk_counts
         return {} unless ::License.feature_available?(:service_desk)
 
@@ -133,31 +126,12 @@ module Gitlab
         }
       end
 
-=======
-      def features_usage_data
-        features_usage_data_ce
-      end
-
-      def features_usage_data_ce
-        {
-          signup: current_application_settings.signup_enabled?,
-          ldap: Gitlab.config.ldap.enabled,
-          gravatar: current_application_settings.gravatar_enabled?,
-          omniauth: Gitlab.config.omniauth.enabled,
-          reply_by_email: Gitlab::IncomingEmail.enabled?,
-          container_registry: Gitlab.config.registry.enabled,
-          gitlab_shared_runners: Gitlab.config.gitlab_ci.shared_runners_enabled
-        }
-      end
-
->>>>>>> ce-com/master
       def components_usage_data
         {
           gitlab_pages: { enabled: Gitlab.config.pages.enabled, version: Gitlab::Pages::VERSION },
           git: { version: Gitlab::Git.version },
           database: { adapter: Gitlab::Database.adapter_name, version: Gitlab::Database.version }
         }
-<<<<<<< HEAD
       end
 
       def license_edition(plan)
@@ -169,8 +143,6 @@ module Gitlab
         else # Older licenses
           'EE'
         end
-=======
->>>>>>> ce-com/master
       end
 
       def services_usage

spec/lib/gitlab/usage_data_spec.rb

@@ -43,11 +43,8 @@ describe Gitlab::UsageData do
         container_registry
         gitlab_pages
         gitlab_shared_runners
-<<<<<<< HEAD
         elasticsearch
         geo
-=======
->>>>>>> ce-com/master
         git
         database
       ))
@@ -130,7 +127,6 @@ describe Gitlab::UsageData do
     end
   end
 
-<<<<<<< HEAD
   describe '#features_usage_data_ee' do
     subject { described_class.features_usage_data_ee }
 
@@ -140,8 +136,6 @@ describe Gitlab::UsageData do
     end
   end
 
-=======
->>>>>>> ce-com/master
   describe '#components_usage_data' do
     subject { described_class.components_usage_data }