✨

gwendolyn/cogs/misc_cog.py

@@ -61,30 +61,18 @@ class MiscCog(commands.Cog):
 
     @cog_ext.cog_slash(**params["name"])
     async def name(self, ctx: SlashContext):
-<<<<<<< HEAD
-        """_generate a random name."""
-=======
         """Generate a random name."""
->>>>>>> 89d0c0b9fba7de53e5ff5de563e41ae22303e3e8
         await self.generators.name_gen(ctx)
 
     @cog_ext.cog_slash(**params["tavern"])
     async def tavern(self, ctx: SlashContext):
-<<<<<<< HEAD
-        """_generate a random tavern name."""
-=======
         """Generate a random tavern name."""
->>>>>>> 89d0c0b9fba7de53e5ff5de563e41ae22303e3e8
         await self.generators.tavern_gen(ctx)
 
     @cog_ext.cog_slash(**params["wiki"])
     async def wiki(self, ctx: SlashContext, wiki_page=""):
         """Get a page on a fandom wiki."""
-<<<<<<< HEAD
-        await self.bot.other.find_wiki_page(ctx, page)
-=======
         await self.bot.other.find_wiki_page(ctx, wiki_page)
->>>>>>> 89d0c0b9fba7de53e5ff5de563e41ae22303e3e8
 
     @cog_ext.cog_slash(**params["add_movie"])
     async def add_movie(self, ctx: SlashContext, movie):

requirements.txt

@@ -1,32 +1,4 @@
 d20==1.1.2
-<<<<<<< HEAD
-discord.py>=1.7.3
-discord-py-slash-command==3.0.1
-dnspython==1.16.0
-fandom-py==0.2.1
-finnhub-python==2.4.2
-gitdb==4.0.7
-GitPython==3.1.18
-greenlet==1.1.1
-idna==3.2
-IMDbPY==2021.4.18
-jaraco.context==4.0.0
-lark-parser==0.9.0
-lxml==4.7.1
-more-itertools==8.8.0
-multidict==5.1.0
-Pillow==9.0.0
-pymongo==3.12.0
-pymongo[srv]
-requests==2.26.0
-setuptools==57.4.0
-smmap==4.0.0
-soupsieve==2.2.1
-SQLAlchemy==1.4.22
-typing-extensions==3.10.0.0
-urllib3==1.26.6
-wheel==0.37.0
-=======
 discord.py==1.7.3
 discord_py_slash_command==3.0.3
 fandom_py==0.2.1
@@ -36,7 +8,7 @@ IMDbPY==2021.4.18
 lxml==4.8.0
 Pillow==9.1.0
 pymongo==4.1.1
+pymongo[srv]
 requests==2.27.1
->>>>>>> 89d0c0b9fba7de53e5ff5de563e41ae22303e3e8
 wolframalpha==5.0.0
-xmltodict==0.13.0
+xmltodict==0.13.0