# Conflicts:
#	app/assets/stylesheets/framework/common.scss
#	app/assets/stylesheets/framework/header.scss

[ci skip]