tiramisu/seyfert
5
0
Fork 0
mirror of https://github.com/tiramisulabs/seyfert.git synced 2025-07-03 13:36:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolve conflict

Browse Source
This commit is contained in:
Nicolás Serna 2022-07-19 19:17:16 -03:00
parent 17b4021fc6
commit e7c27bad1c
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/biscuit/structures/channels.ts
View File

@ -92,13 +92,9 @@ export abstract class BaseChannel implements Model {
} }
} }
<<<<<<< HEAD
/** CategoryChannel */
=======
/** /**
* Represents a category channel. * Represents a category channel.
*/ */
>>>>>>> 50213749703d33ee39bdc1044e03fa18cd3a7052
export class CategoryChannel extends BaseChannel { export class CategoryChannel extends BaseChannel {
constructor(session: Session, data: DiscordChannel) { constructor(session: Session, data: DiscordChannel) {
super(session, data); super(session, data);