Merge branch 'master' into commit-proto-files

tokoko · Sep 20, 2024 · da44927 · da44927
2 parents 04b92c1 + 4e2eacc
commit da44927
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,11 +1,5 @@
 [build-system]
 requires = [
-<<<<<<< HEAD
-=======
-  "protobuf<5",
-  "grpcio-tools>=1.56.2,<2",
-  "mypy-protobuf>=3.1",
->>>>>>> 4e2eacc1 (fix: Fix for SQL registry initialization fails #4543 (#4544))
   "pybindgen==0.22.0",
   "setuptools>=60",
   "setuptools_scm>=6.2",