summaryrefslogtreecommitdiff
path: root/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager/merge_settings.py
AgeCommit message (Expand)AuthorFilesLines
2020-04-03phosphor-settingsd: srcrev bump 3d805fe94a..6f62cc844bAndrew Geissler1-2/+2
2018-09-06meta-phosphor: Move layer content from common/Brad Bishop1-0/+58