Removing conflict lines. Closes #597
Removing conflict lines. Closes #597

EMarcais/frontend,EMarcais/frontend,ashwingj/frontend,Yetangitu/frontend,yetixxx83/frontend,Yetangitu/frontend,meatcar/frontend,yetixxx83/frontend,mrzen/trovebox,EMarcais/frontend,Yetangitu/frontend,meatcar/frontend,yetixxx83/frontend,ashwingj/frontend,unhosted/openphoto,ashwingj/frontend,mrzen/trovebox,meatcar/frontend,photo/frontend,ashwingj/frontend,mrzen/trovebox,photo/frontend,photo/frontend,unhosted/openphoto,photo/frontend,unhosted/openphoto,yetixxx83/frontend,mrzen/trovebox,EMarcais/frontend,meatcar/frontend,Yetangitu/frontend