engineering
/
community-relations
3
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases 1 Wiki Activity

Conflict

merge-requests/9/merge
Bsian 2020-04-17 14:50:50 +01:00
parent c02e3e7f28 a1e8510073
commit 7e25f7ae70
No known key found for this signature in database
GPG Key ID: 097FB9A291026091
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/class/Util.ts
View File

@ -126,12 +126,4 @@ export default class Util {
const asHex = number.toString(16);
return '#000000'.substring(0, 7 - asHex.length) + asHex;
}
<<<<<<< HEAD
=======
public guildFromMessage(message: Message): Guild | null {
if (message.channel instanceof PrivateChannel || message.channel instanceof GroupChannel) return null;
return message.channel.guild;
}
>>>>>>> dev
}