fix some merge mistakes
1429226f6de2
Actions

Authored by aubort on Jul 24 2017, 12:10.

Description

fix some merge mistakes

Committed

aubort

Jul 24 2017, 12:10

Pushed

aubort

Jul 24 2017, 12:10

Parents

rPH24acd5ab7c90: fix missing merge

Branches

Unknown

Tags

Unknown

				Path
	M			resources/celerity/map.php
	M			src/applications/differential/xaction/DifferentialRevisionReviewTransaction.php
	D			src/applications/maniphest/config/ManiphestSubtypesConfigOptionsType.php
	D			src/infrastructure/cluster/config/PhabricatorClusterDatabasesConfigOptionType.php
	M			webroot/rsrc/css/application/search/application-search-view.css
	M			webroot/rsrc/css/application/search/search-results.css