# Conflicts:
#	app/models/clusters/platforms/kubernetes.rb
#	app/views/projects/blob/_blob.html.haml

[ci skip]