diff options
| author | Nino Breuer | 2014-09-02 16:07:31 +0200 |
|---|---|---|
| committer | Nino Breuer | 2014-09-02 16:07:31 +0200 |
| commit | 4c0c5f664ae8c3b53d16e0d997faf6232d572df9 (patch) | |
| tree | 65aaf171fb3e04312d5b18e470f2d56ecc745f25 /Dozentenmodul/src/gui/intro/Login_GUI.java | |
| parent | nix (diff) | |
| parent | nix (diff) | |
| download | tutor-module-4c0c5f664ae8c3b53d16e0d997faf6232d572df9.tar.gz tutor-module-4c0c5f664ae8c3b53d16e0d997faf6232d572df9.tar.xz tutor-module-4c0c5f664ae8c3b53d16e0d997faf6232d572df9.zip | |
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Conflicts:
Dozentenmodul/bin/gui/intro/Login_GUI.class
Diffstat (limited to 'Dozentenmodul/src/gui/intro/Login_GUI.java')
| -rw-r--r-- | Dozentenmodul/src/gui/intro/Login_GUI.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Dozentenmodul/src/gui/intro/Login_GUI.java b/Dozentenmodul/src/gui/intro/Login_GUI.java index ede4bf27..9e5244c9 100644 --- a/Dozentenmodul/src/gui/intro/Login_GUI.java +++ b/Dozentenmodul/src/gui/intro/Login_GUI.java @@ -306,10 +306,10 @@ public class Login_GUI extends JFrame { //Sp�ter �ber result.getRole zum Beispiel die Rolle holen - //person.verantwortlicher.setRole("Dozent"); + person.verantwortlicher.setRole("Dozent"); //person.verantwortlicher.setRole("Admin"); //person.verantwortlicher.setRole("Student"); - person.verantwortlicher.setRole("GetToTheChopper!"); + //person.verantwortlicher.setRole("GetToTheChopper!"); try { |