> Hi Stevan, > > Did you know you can do: bzr diff? > > http://doc.bazaar.canonical.com/bzr.2.2/en/user-reference/diff-help.html > > Phill > On May 21, 2012 2:37 AM, "Stevan Pettit" <[email protected]> wrote: > > > Stevan Pettit has proposed merging lp:~smpettit/openlp/portable into > > lp:openlp. > > > > Requested reviews: > > OpenLP Core (openlp-core) > > > > For more details, see: > > https://code.launchpad.net/~smpettit/openlp/portable/+merge/106555 > > > > Dummy proposal to review changes made > > -- > > https://code.launchpad.net/~smpettit/openlp/portable/+merge/106555 > > You are subscribed to branch lp:openlp. > > > > === modified file 'openlp/core/__init__.py' > > --- openlp/core/__init__.py 2012-04-28 13:51:05 +0000 > > +++ openlp/core/__init__.py 2012-05-21 01:36:20 +0000 > > @@ -41,6 +41,7 @@ > > from PyQt4 import QtCore, QtGui > > > > from openlp.core.lib import Receiver, check_directory_exists > > +from openlp.core.lib.settings import Settings > > from openlp.core.lib.ui import UiStrings > > from openlp.core.resources import qInitResources > > from openlp.core.ui.mainwindow import MainWindow > > @@ -48,7 +49,7 @@ ............
Yehh, but as others have said, it's not as easy to read nor as "pretty" as a merge proposal. -- https://code.launchpad.net/~smpettit/openlp/portable/+merge/106555 Your team OpenLP Core is requested to review the proposed merge of lp:~smpettit/openlp/portable into lp:openlp. _______________________________________________ Mailing list: https://launchpad.net/~openlp-core Post to : [email protected] Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
