diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2015-05-20 03:39:58 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2015-05-20 03:39:58 +0200 |
| commit | 4f36aa39a4e8aa5128c12a713bd9d3d4d9b51469 (patch) | |
| tree | 1a87a4e98b88f4e0eb3fc36bcee74f403acf0abe /src/main/java/eu/siacs/conversations/entities/MucOptions.java | |
| parent | fbf81f59dbc17951faea945cca979312201d00fe (diff) | |
| parent | 7824c01748a89688c5f76307cc1f4221a9e2ffb5 (diff) | |
Merge branch 'development'1.4.0
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); } } } |