Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module

Conflicts:
	fdghf
Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
	Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$2.class
	Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$3.class
	Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class
	Dozentenmodul/src/gui/image/DeleteImage_GUI.java

1 files changed, 0 insertions, 13 deletions

diff --git a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java
index 7d3d9cae..41254bea 100644
--- a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java
+++ b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java
@@ -7,7 +7,6 @@ import java.awt.FlowLayout;
 import java.awt.Toolkit;
 import javax.swing.JFrame;
 import javax.swing.JButton;
-import javax.swing.JDialog;
 import javax.swing.JPanel;
 import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
@@ -57,18 +56,6 @@ public class MainMenue_GUI extends JFrame {
 	JRadioButton rdbtnLectureSearch;
 	private final ButtonGroup buttonGroup = new ButtonGroup();
 
-	/**
-	 * Launch the application.
-	 */
-	public static void main(String[] args) {
-		try {
-			MainMenue_GUI dialog = new MainMenue_GUI();
-			dialog.setDefaultCloseOperation(JDialog.HIDE_ON_CLOSE);
-			dialog.setVisible(true);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}// end main
 
 	/**
 	 * Create the dialog.