diff options
| author | unknown | 2014-04-10 16:50:14 +0200 |
|---|---|---|
| committer | unknown | 2014-04-10 16:50:14 +0200 |
| commit | 236f2e7bf2c9d5cdec6da36140ee7dcac7944998 (patch) | |
| tree | 2de499a71a527c7320b2096c17c5a69d2ea8d288 /Dozentenmodulserver/src/server/User.java | |
| parent | bfg (diff) | |
| parent | cdsc (diff) | |
| download | tutor-module-236f2e7bf2c9d5cdec6da36140ee7dcac7944998.tar.gz tutor-module-236f2e7bf2c9d5cdec6da36140ee7dcac7944998.tar.xz tutor-module-236f2e7bf2c9d5cdec6da36140ee7dcac7944998.zip | |
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Conflicts:
Dozentenmodul/src/GUI/SearchImage_GUI.java
Dozentenmodul/src/Models/person.java
Dozentenmodul/src/Models/vm.java
Diffstat (limited to 'Dozentenmodulserver/src/server/User.java')
| -rw-r--r-- | Dozentenmodulserver/src/server/User.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Dozentenmodulserver/src/server/User.java b/Dozentenmodulserver/src/server/User.java index 5fd2f983..7bf98cc4 100644 --- a/Dozentenmodulserver/src/server/User.java +++ b/Dozentenmodulserver/src/server/User.java @@ -5,6 +5,7 @@ * @generated */ package server; + import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.SchemeFactory; import org.apache.thrift.scheme.StandardScheme; |