Adding shit again

2024-12-14 17:37:32 -05:00
parent 3b1d35f311 6084b0ef7c
commit ced1a3aab0
6 changed files with 670 additions and 431 deletions
--- a/.flake8
+++ b/.flake8
@@ -46,4 +46,9 @@ ignore =
    E128
    E231 
    E226
+<<<<<<< HEAD
    E262
+=======
+
+
+>>>>>>> 6084b0ef7c6d352e99bdc7e2a0bf1f076680fa4b