| commit | a279367b5c8361a93bad1cab2e0874f08f33f594 | [log] [tgz] |
|---|---|---|
| author | Michael Hanl <hanl@ids-mannheim.de> | Sat Feb 06 15:04:45 2016 +0100 |
| committer | Michael Hanl <hanl@ids-mannheim.de> | Sat Feb 06 15:04:45 2016 +0100 |
| tree | 3dcf5bdc4eae22b31758da3e73cd8ee0ba396b5f | |
| parent | cf9c6ea208f4ed36e9f45487f0e964f8f8540747 [diff] | |
| parent | 51a1a017f790184b93fe3a20890b9b05e736f0d6 [diff] |
Merge branch 'master' of ssh://korap.ids-mannheim.de:29418/private/Kustvakt-core
diff --git a/src/main/java/de/ids_mannheim/korap/user/Userdetails.java b/src/main/java/de/ids_mannheim/korap/user/UserDetails.java similarity index 100% rename from src/main/java/de/ids_mannheim/korap/user/Userdetails.java rename to src/main/java/de/ids_mannheim/korap/user/UserDetails.java
diff --git a/src/main/java/de/ids_mannheim/korap/user/Usersettings.java b/src/main/java/de/ids_mannheim/korap/user/UserSettings.java similarity index 100% rename from src/main/java/de/ids_mannheim/korap/user/Usersettings.java rename to src/main/java/de/ids_mannheim/korap/user/UserSettings.java