# Conflicts:
#	db/schema.rb
#	spec/lib/gitlab/usage_data_spec.rb

[ci skip]