Minor, fix more merge failures.
c6ca409a035e
Actions

Authored by epriestley <git@epriestley.com> on Dec 7 2012, 22:49.

Description

Minor, fix more merge failures.

Committed

epriestley <git@epriestley.com>

Dec 7 2012, 22:49

Pushed

aubort

Jan 31 2017, 17:16

Parents

rPH54fe74d62167: WIP

Branches

Unknown

Tags

Unknown

epriestley <git@epriestley.com> committed rPHc6ca409a035e: Minor, fix more merge failures. (authored by epriestley <git@epriestley.com>).Dec 7 2012, 22:49

				Path
	M			src/__celerity_resource_map__.php
	M			webroot/rsrc/css/application/base/main-menu-view.css
	M			webroot/rsrc/js/application/core/behavior-phabricator-nav.js