fixed conflict in dashboard pom
cea3654e998f
Actions

Authored by Ty <Ty_Coghlan@hms.harvard.edu> on Oct 12 2016, 20:52.

Description

fixed conflict in dashboard pom

Committed

Ty <Ty_Coghlan@hms.harvard.edu>

Oct 12 2016, 20:52

Pushed

mickmis

Mar 14 2017, 15:12

Parents

Branches

Unknown

Tags

Unknown

Ty <Ty_Coghlan@hms.harvard.edu> committed R2664:cea3654e998f: fixed conflict in dashboard pom (authored by Ty <Ty_Coghlan@hms.harvard.edu>).Oct 12 2016, 20:52

				Path
	M			apps/dashboard-app/pom.xml
	M			apps/steward-app/src/test/scala/net/shrine/steward/StewardServiceSpec.scala