From 00456bee11b654ba896325098c3dc3c54c2c6d75 Mon Sep 17 00:00:00 2001
From: bodombeach <nicolas.bertin0@gmail.com>
Date: Wed, 29 May 2024 17:22:20 +0200
Subject: [PATCH] fix merging issue

---
 src/events/commands/archive.js | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/events/commands/archive.js b/src/events/commands/archive.js
index 606b57b..c7b6563 100644
--- a/src/events/commands/archive.js
+++ b/src/events/commands/archive.js
@@ -5,19 +5,11 @@ const { archive } = require('../../utils/archive.js');
 
 // Creates an Object in JSON with the data required by Discord's API to create a SlashCommand
 const create = () => {
-<<<<<<< HEAD
-  const command = new SlashCommandBuilder()
-    .setName('archive')
-    .setDescription('Archive ce salon')
-  return command.toJSON();
-};
-=======
 	const command = new SlashCommandBuilder()
 		.setName('archive')
 		.setDescription('Archive ce salon (fonctionne uniquement sur les salons sorties/compétitions/événements)')
     return command.toJSON();
   };
->>>>>>> feature-licence
 
 // Called by the interactionCreate event listener when the corresponding command is invoked
 const invoke = async (interaction) => {