I got a very minor merge conflict for UpdateManager/UpdateManager.py
<<<<<<< TREE
if self._get_last_apt_get_update_text() is not None: text_label_main = self._get_last_apt_get_update_text() ago_minutes = self._get_last_apt_get_update_minutes()
if ago_minutes is not None and ago_minutes > self.NO_UPDATE_WARNING_DAYS*24*60: text_header = _("Software updates may be available for your computer.")
# add timer to ensure we update the information when the
# last package count update was performed GObject.timeout_add_seconds(10, self.update_last_updated_text, None)
=======
>>>>>>> MERGE-SOURCE
I manually fixed the merge and tested. After applying updates I noticed the "Details of updates" expander doesn't get hidden. Perhaps that is expected at this point and fixed in another branch.
I got a very minor merge conflict for UpdateManager/ UpdateManager. py
<<<<<<< TREE last_apt_ get_update_ text() is not None:
text_label_ main = self._get_ last_apt_ get_update_ text()
ago_minutes = self._get_ last_apt_ get_update_ minutes( ) UPDATE_ WARNING_ DAYS*24* 60:
text_ header = _("Software updates may be available for your computer.")
GObject. timeout_ add_seconds( 10, self.update_ last_updated_ text, None)
if self._get_
if ago_minutes is not None and ago_minutes > self.NO_
# add timer to ensure we update the information when the
# last package count update was performed
=======
>>>>>>> MERGE-SOURCE
I manually fixed the merge and tested. After applying updates I noticed the "Details of updates" expander doesn't get hidden. Perhaps that is expected at this point and fixed in another branch.
Still reviewing... more to come later.