merge conflicts in problems controller
e2e0d9be4935
Actions

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

Description

merge conflicts in problems controller

Committed

Ty <Ty_Coghlan@hms.harvard.edu>

Oct 12 2016, 21:48

Pushed

mickmis

Mar 14 2017, 15:12

Parents

R2664:60468efc7bf5: merge conflicts in diagnostic

Branches

Unknown

Tags

Unknown

Ty <Ty_Coghlan@hms.harvard.edu> committed R2664:e2e0d9be4935: merge conflicts in problems controller (authored by Ty <Ty_Coghlan@hms.harvard.edu>).Oct 12 2016, 21:48

				Path
	M			apps/dashboard-app/src/main/js/src/app/diagnostic/views/problems.controller.js
	M			apps/dashboard-app/src/main/js/src/app/shrine-tools.service.js
	M			commons/config/src/main/scala/net/shrine/config/mappings/AdapterMappings.scala
	M			commons/config/src/main/scala/net/shrine/config/mappings/ClasspathFormatDetectingAdapterMappingsSource.scala