ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-19 07:38:15 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/open1223' into open-1338

Browse Source 
Resolve merge conflicts due to whitespace changes.
This commit is contained in:
larkin
2015-06-29 12:08:16 -07:00
parent 84345caf7d 065a5a6fbf
commit 38ad8058e8
25 changed files with 547 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platform/core/src/capabilities/CoreCapabilityProvider.js
View File

@ -53,7 +53,7 @@ define(
function packageCapabilities(capabilities) {
var result = {};
capabilities.forEach(function (capability) {
if (capability.key) {
if (capability.key && !result[capability.key]) {
result[capability.key] = capability;
} else {
$log.warn("No key defined for capability; skipping.");
@ -91,4 +91,4 @@ define(
return CoreCapabilityProvider;
}
);
);