fix merge conflict

This commit is contained in:
SpaceEEC
2017-06-23 21:49:56 +02:00
committed by Amish Shah
parent 830d8fb3b5
commit 86ec60bc00
2 changed files with 27 additions and 8 deletions

View File

@@ -62,8 +62,8 @@ class Guild {
*/
this.id = data.id;
} else {
this.available = true;
this.setup(data);
if (!data.channels) this.available = false;
}
}