Resolve conflict

This commit is contained in:
Nicolás Serna 2022-07-19 19:17:16 -03:00
parent 17b4021fc6
commit e7c27bad1c

View File

@ -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);