# Conflicts:
#	app/assets/stylesheets/framework/markdown_area.scss
#	app/assets/stylesheets/pages/merge_requests.scss
#	doc/user/markdown.md

[ci skip]