mirror of
https://github.com/munki/munki.git
synced 2026-05-19 04:38:34 -05:00
df7ea0d4d5
# Conflicts: # code/apps/Managed Software Center/Managed Software Center.xcodeproj/project.pbxproj # code/apps/Managed Software Center/Managed Software Center/Base.lproj/MainMenu.xib # code/apps/Managed Software Center/Managed Software Center/Controllers/MainWindowController.swift # code/apps/Managed Software Center/Managed Software Center/Resources/WebResources/updates.css # code/apps/Managed Software Center/Managed Software Center/en-AU.lproj/InfoPlist.strings # code/apps/Managed Software Center/Managed Software Center/msclog.swift