OpenLP

Code review comment for lp:~j-corwin/openlp/presentations

  1. presentations
  2. Merge into trunk
Revision history for this message
Jonathan Corwin (j-corwin) wrote :

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.

« Back to merge proposal