# Conflicts:
#	Gemfile.lock
#	app/assets/javascripts/dispatcher.js
#	app/controllers/omniauth_callbacks_controller.rb
#	app/helpers/nav_helper.rb
#	app/models/issue.rb
#	app/models/merge_request.rb
#	app/models/namespace.rb
#	db/schema.rb
#	doc/ci/examples/README.md
#	spec/javascripts/boards/mock_data.js

[ci skip]