merge taroon branch up until now. tagged as before-taroon-merge before and

will be tagged after-taroon-merge after.  taroon at this point is tagged
taroon-merge-point for where to base merges from in the future

1 files changed, 0 insertions, 1 deletions

diff --git a/gui.py b/gui.py
index dde475adf..b65ac0a91 100755
--- a/gui.py
+++ b/gui.py
@@ -52,7 +52,6 @@ stepToClass = {
     "addswap" : ("upgrade_swap_gui", "UpgradeSwapWindow"),
     "upgrademigratefs" : ("upgrade_migratefs_gui", "UpgradeMigrateFSWindow"),
     "fdisk" : ("fdisk_gui", "FDiskWindow"),
-    "fdasd" : ("fdasd_gui", "FDasdWindow"),
     "bootloader": ("bootloader_main_gui", "MainBootloaderWindow"),
     "bootloaderadvanced": ("bootloader_advanced_gui", "AdvancedBootloaderWindow"),
     "upgbootloader": ("upgrade_bootloader_gui", "UpgradeBootloaderWindow"),