Merge conflicts

ocadotechnology · Aug 31, 2023 · 002f410 · 002f410
2 parents c30a2c0 + 2b71f0d
commit 002f410
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 30 deletions.
diff --git a/aimmo-game-worker/Pipfile b/aimmo-game-worker/Pipfile
@@ -13,7 +13,7 @@ aiohttp-cors = "*"
 docker = "<6"
 idna-ssl = "*"
 kubernetes = "==26.1.0"
-restrictedpython = "==5.3"
+restrictedpython = "==5.4"
 
 [requires]
 python_version = "3.8"
diff --git a/aimmo-game-worker/Pipfile.lock b/aimmo-game-worker/Pipfile.lock
diff --git a/game_frontend/yarn.lock b/game_frontend/yarn.lock
@@ -3,9 +3,9 @@
 
 
 "@adobe/css-tools@^4.0.1":
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.2.0.tgz#e1a84fca468f4b337816fcb7f0964beb620ba855"
-  integrity sha512-E09FiIft46CmH5Qnjb0wsW54/YQd69LsxeKUOWawmws1XWvyFGURnAChH0mlr7YPFR1ofwvUQfcL0J3lMxXqPA==
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.3.1.tgz#abfccb8ca78075a2b6187345c26243c1a0842f28"
+  integrity sha512-/62yikz7NLScCGAAST5SHdnjaDJQBDq0M2muyRTpf2VQhw6StBg2ALiu73zSJQ4fMVLA+0uBhBHAle7Wg+2kSg==
 
 "@ampproject/remapping@^2.2.0":
   version "2.2.1"