mirror of
https://github.com/tiramisulabs/seyfert.git
synced 2025-07-03 05:26:07 +00:00
Resolve conflict
This commit is contained in:
parent
17b4021fc6
commit
e7c27bad1c
@ -92,13 +92,9 @@ export abstract class BaseChannel implements Model {
|
||||
}
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
/** CategoryChannel */
|
||||
=======
|
||||
/**
|
||||
* Represents a category channel.
|
||||
*/
|
||||
>>>>>>> 50213749703d33ee39bdc1044e03fa18cd3a7052
|
||||
export class CategoryChannel extends BaseChannel {
|
||||
constructor(session: Session, data: DiscordChannel) {
|
||||
super(session, data);
|
||||
|
Loading…
x
Reference in New Issue
Block a user