# Conflicts:
#	.eslintrc.yml
#	.gitignore
#	.travis.yml
#	Makefile
#	dist/markdown-it-container.js
#	dist/markdown-it-container.min.js
#	package.json
#	test/api.js
#	test/default.js
#	test/misc.js