diff --git a/.gitignore b/.gitignore index 59fb926..84db35a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,5 @@ -*/__pycache__/ \ No newline at end of file +<<<<<<< HEAD +*/__pycache__/ +======= +*/__pycache__/ +>>>>>>> 17924159a14cb91a13961fefe6b58e69eb06988b