diff options
| author | lookshe <github@lookshe.org> | 2015-08-11 17:35:53 +0200 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2015-08-11 17:35:53 +0200 |
| commit | 8fd688ca96005152be754eeba1be72c7c0aab9ad (patch) | |
| tree | c4d2e3dfe7250a6794aaa3fa9816ad3da70a813e /src/main/java/eu/siacs/conversations/entities/MucOptions.java | |
| parent | 553f41a2dbc068a8a43f613e088713cd3ec7680e (diff) | |
Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities/MucOptions.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/entities/MucOptions.java | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/MucOptions.java b/src/main/java/eu/siacs/conversations/entities/MucOptions.java index addee8db..d867a370 100644 --- a/src/main/java/eu/siacs/conversations/entities/MucOptions.java +++ b/src/main/java/eu/siacs/conversations/entities/MucOptions.java @@ -343,8 +343,6 @@ public class MucOptions { setError(ERROR_BANNED); } else if (error != null && error.hasChild("registration-required")) { setError(ERROR_MEMBERS_ONLY); - } else { - setError(ERROR_UNKNOWN); } } } |