The Mnemosyne Project

Merge lp:~jmehne/mnemosyne-proj/pbienst into lp:~peter-bienstman/mnemosyne-proj/pbienst

  1. pbienst
  2. Merge into pbienst
Proposed by Julian Mehne
Status: Rejected
Rejected by: Peter Bienstman
Proposed branch: lp:~jmehne/mnemosyne-proj/pbienst
Merge into: lp:~peter-bienstman/mnemosyne-proj/pbienst
Diff against target: 10 lines (+1/-1)
1 file modified
mnemosyne/mnemosyne/pyqt_ui/manage_card_types_dlg.py (+1/-1)
To merge this branch: bzr merge lp:~jmehne/mnemosyne-proj/pbienst
Reviewer Review Type Date Requested Status
Peter Bienstman Disapprove
Review via email: mp+332234@code.launchpad.net

Description of the change

I believe there is an incorrect import. Without this change, mnemosyne in your private branch crashes for me.

This is my first experience with launchpad, so let's see if this works ...

To post a comment you must log in.
Revision history for this message
Peter Bienstman (peter-bienstman) wrote :

There was a missing file in launchpad, should be fixed now. Note if you follow the pbienst branch, it's really bleeding edge, and things might be broken from time to time.

Revision history for this message
Peter Bienstman (peter-bienstman) :
review: Disapprove

Unmerged revisions

2088. By Julian Mehne <email address hidden>

Fix imports.

Crashes without this change.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mnemosyne/mnemosyne/pyqt_ui/manage_card_types_dlg.py'
2--- mnemosyne/mnemosyne/pyqt_ui/manage_card_types_dlg.py 2017-09-28 16:52:18 +0000
3+++ mnemosyne/mnemosyne/pyqt_ui/manage_card_types_dlg.py 2017-10-13 12:52:00 +0000
4@@ -8,7 +8,7 @@
5 from mnemosyne.libmnemosyne.card_type import CardType
6 from mnemosyne.pyqt_ui.clone_card_type_dlg import CloneCardTypeDlg
7 from mnemosyne.pyqt_ui.ui_manage_card_types_dlg import Ui_ManageCardTypesDlg
8-from mnemosyne.pyqt_ui.edit_M_sided_card_type_dlg import EditMSidedCardTypeDlg
9+from mnemosyne.pyqt_ui.ui_edit_M_sided_card_type_dlg import Ui_EditMSidedCardTypeDlg
10 from mnemosyne.libmnemosyne.ui_components.dialogs import ManageCardTypesDialog
11
12

Subscribers

People subscribed via source and target branches