Commit d48c0ddb authored by Tracie Sucharski's avatar Tracie Sucharski
Browse files

git merge created 2 newDockAvailable definitions.

parent 2fc7559d

isis/src/qisis/objs/Directory/Directory.h

+0 −1
Original line number Diff line number Diff line
@@ -362,7 +362,6 @@ namespace Isis { 
    signals:

      void directoryCleaned();

      void newWarning();

      void newDockAvailable(QMainWindow *newWidget);

      void newWidgetAvailable(QWidget *newWidget);

      void newDockAvailable(QMainWindow *newWidget);