My changes

2024-03-06 18:11:42 -06:00
parent 8986493161 7688f1aac1
commit 0e123fe70f
45 changed files with 4876 additions and 272 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,10 @@ composer.phar
 /concept/
 /backup/
 /.vscode/
+<<<<<<< HEAD
 /export/
+=======
+>>>>>>> 7688f1aac1824c234bc5f19b154e9ad1f4808d4f
 /log/

 /include/.env