ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-02-21 17:57:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Search] Fixing conflicts

Browse Source
This commit is contained in:
shale 2015-07-27 13:32:06 -07:00
commit dc79f460e5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/features/search/src/SearchAggregator.js
View File

@ -121,7 +121,7 @@ define(
newerResults = filterRepeats(newerResults);
newerResults = orderByScore(newerResults);
// After all that is done, now replace latestMergedResults with this
// Now replace latestMergedResults
latestMergedResults = newerResults;
lastMergeTimestamps = providerTimestamps;
}