解决冲突

2023-06-12 14:35:14 +08:00
parent e0983d0530
commit 3d04200ca7
167 changed files with 3468 additions and 7898 deletions
--- a/web_environment_ribbon/tests/init.py
+++ b/web_environment_ribbon/tests/init.py
@@ -0,0 +1,3 @@
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from . import test_environment_ribbon_data