Fix merge conflicts

diff --cc lib/gui_lite.py
index f751358,b1675d9..8bd69c9
--- 1/lib/gui_lite.py
--- 2/lib/gui_lite.py
+++ b/lib/gui_lite.py
@@@ -184,33 -183,25 +184,31 @@@ class MiniWindow(QDialog)
  
          menubar = QMenuBar()
          electrum_menu = menubar.addMenu(_("&Bitcoin"))
 +        self.servers_menu = electrum_menu.addMenu(_("&Servers"))
 +        self.servers_menu.addAction(_("Foo"))
 +        electrum_menu.addSeparator()
 +        brain_seed = electrum_menu.addAction(_("&BrainWallet Info"))
 +        brain_seed.triggered.connect(self.actuator.show_seed_dialog)
++
          electrum_menu.addAction(_("&Quit"))
  
          view_menu = menubar.addMenu(_("&View"))
          expert_gui = view_menu.addAction(_("&Pro Mode"))
 -        self.connect(expert_gui, SIGNAL("triggered()"), expand_callback)
 -
 +        expert_gui.triggered.connect(expand_callback)
 +        view_menu.addMenu(_("&Themes"))
 +        view_menu.addSeparator()
          show_history = view_menu.addAction(_("Show History"))
          show_history.setCheckable(True)
 -        self.connect(show_history, SIGNAL("toggled(bool)"), self.show_history)
 +        show_history.toggled.connect(self.show_history)
  
-         settings_menu = menubar.addMenu(_("&Settings"))
-         settings_menu.addAction(_("&Configure Electrum"))
-         
          help_menu = menubar.addMenu(_("&Help"))
          the_website = help_menu.addAction(_("&Website"))
 -        self.connect(the_website, SIGNAL("triggered()"), self.the_website)
 +        the_website.triggered.connect(self.the_website)
          help_menu.addSeparator()
          report_bug = help_menu.addAction(_("&Report Bug"))
 -        self.connect(report_bug, SIGNAL("triggered()"), self.show_report_bug)
 +        report_bug.triggered.connect(self.show_report_bug)
          show_about = help_menu.addAction(_("&About"))
 -        self.connect(show_about, SIGNAL("triggered()"), self.show_about)
 -
 +        show_about.triggered.connect(self.show_about)
          main_layout.setMenuBar(menubar)
  
          quit_shortcut = QShortcut(QKeySequence("Ctrl+Q"), self)