Permalink
Browse files

Fix bad merge conflict resolution

  • Loading branch information...
gregneagle committed Jan 17, 2018
1 parent 7fa67a2 commit 7a4a8b5e8afc74834a2545e58da8a21ed1b1a3dd
Showing with 0 additions and 9 deletions.
  1. +0 −9 code/client/munkilib/updatecheck/analyze.py
@@ -370,15 +370,6 @@ def process_install(manifestitem, cataloglist, installinfo,
iteminfo['display_name'] = item_pl.get('display_name', iteminfo['name'])
iteminfo['description'] = item_pl.get('description', '')

<<<<<<< Local Changes
<<<<<<< Local Changes
=======
if item_pl.get('localized_strings'):
iteminfo['localized_strings'] = item_pl['localized_strings']

>>>>>>> External Changes
=======
>>>>>>> External Changes
if not dependencies_met:
display.display_warning(
'Didn\'t attempt to install %s because could not resolve all '

0 comments on commit 7a4a8b5

Please sign in to comment.