From e7c27bad1cde7c0913ab4e186abd3fc635ff306c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20Serna?= <nicolito128@hotmail.com>
Date: Tue, 19 Jul 2022 19:17:16 -0300
Subject: [PATCH] Resolve conflict

---
 packages/biscuit/structures/channels.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/biscuit/structures/channels.ts b/packages/biscuit/structures/channels.ts
index ee9f5b3..8ad8b95 100644
--- a/packages/biscuit/structures/channels.ts
+++ b/packages/biscuit/structures/channels.ts
@@ -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);