Resolve conflicts (#208)

2023-07-10 21:50:05 -07:00
parent 6936d6983d
commit 9ca836520f
32 changed files with 396 additions and 207 deletions
--- a/tests/test_embedchain.py
+++ b/tests/test_embedchain.py
@@ -1,7 +1,7 @@
 import os
-
 import unittest
-from unittest.mock import patch, MagicMock
+from unittest.mock import MagicMock, patch
+
 from embedchain import App