Any ideas what I need to do to fix it? 281 +<<<<<<< TREE 282 self._app = None 283 return 284 self._app.Visible = True 285 @@ -165,3 +187,122 @@ 286 # self.preview = w.GetClipboardData.GetData(win32con.CF_BITMAP) 287 # w.CloseClipboard() 288 return self.preview 289 +======= <snip> 407 +>>>>>>> MERGE-SOURCE
Lines 282->284 & 286->288 have been deleted in my version. -- https://code.launchpad.net/~j-corwin/openlp/presentations/+merge/12472 Your team openlp.org Core is subscribed to branch 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
