Head error

Author: windrush123

README.md

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 ## O2EZ BOT
 #Requirements
 [Python (3.9+)](https://www.python.org/downloads/)
@@ -22,33 +21,4 @@ to run the bot, open powershell and type `python insert_bot_file_location` for e
 ```
 python e:/O2JAM/DiscordBot/bot.py
 ```
-to close the bot, just ctrl+c in the powershell
-=======
-# O2EZ BOT
-
-### Requirements
-
-[Python (3.9+)](https://www.python.org/downloads/)
-
-### Installation
-
-We need a specific modules to be installed in order to run our bot.
-Open the Powershell and type.
-```pip install -r requirements.txt```
-
-if some modules are not corectly installed, try.
-```
-python pip install discord.py
-python pip install pyodbc
-python pip install python-dotenv
-```
-
-Bot Token and Database Configs are found in `.emv` file.
-
-
-to run the bot, open powershell and type `python insert_bot_file_location` for example:
-```
-python e:/O2JAM/DiscordBot/bot.py
-```
-to close the bot, just ctrl+c in the powershell
->>>>>>> 40913dfe7853f7c02faff48a8b435e4283af5f3d
+to close the bot, just ctrl+c in the powershell

bot.py

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 import os
 import discord
 import pyodbc

requirements.txt

@@ -1,8 +1,3 @@
-<<<<<<< HEAD
 discord.py==1.7.1
 pyodbc==4.0.30
-=======
-discord.py==1.7.1
-pyodbc==4.0.30
->>>>>>> 40913dfe7853f7c02faff48a8b435e4283af5f3d
 python-dotenv==0.17.0