g Please enter the commit message for your changes. Lines starting
:wq
	public/assets/application-e1202a0e0eadcfd31ce263705919477f.css.gz
Conflict resolution