*** empty log message ***
merge done
init issue
Merge branch 'origin/master'

Conflicts:
	init.el