Resolving conflict

Browse Source

...

This commit is contained in:

Akshath 2023-10-24 18:34:49 +05:30

parent 790529ee12

commit a0d4e04a3c

56 changed files with 95733 additions and 95733 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Crypt_Socket

cryptSocket_cliente.pycryptSocket_servidor.py

DOH-Dig

doh-dig

SSH_Host_Adder

ssh_adder

To Do Bot

ProcfileREADME.mdbot.pydbhelper.pyrequirements.txtruntime.txt

caesar_cipher

caesar.py

git_automation

.my_commands.shREADME.mdcreate.pyrequirements.txt

mailing

gmail_messenger.py

url_shortener

url_shortener.py

0

Crypt_Socket/cryptSocket_cliente.py Executable file → Normal file

0

Crypt_Socket/cryptSocket_servidor.py Executable file → Normal file

0

DOH-Dig/doh-dig Executable file → Normal file

0

SSH_Host_Adder/ssh_adder Executable file → Normal file

0

To Do Bot/Procfile Executable file → Normal file

0

To Do Bot/README.md Executable file → Normal file

0

To Do Bot/bot.py Executable file → Normal file

0

To Do Bot/dbhelper.py Executable file → Normal file

0

To Do Bot/requirements.txt Executable file → Normal file

0

To Do Bot/runtime.txt Executable file → Normal file

0

caesar_cipher/caesar.py Executable file → Normal file

0

git_automation/.my_commands.sh Executable file → Normal file

0

git_automation/README.md Executable file → Normal file

0

git_automation/create.py Executable file → Normal file

0

git_automation/requirements.txt Executable file → Normal file

0

mailing/gmail_messenger.py Executable file → Normal file

0

url_shortener/url_shortener.py Executable file → Normal file