merge

JulienChampagnol · JulienChampagnol · commit 809d5972abab · 2025-12-31T13:53:50.000+01:00
diff --git a/tests/integration/microservices/back/requirements.txt b/tests/integration/microservices/back/requirements.txt
@@ -5,7 +5,4 @@
 #    pip-compile --output-file=tests/integration/microservices/back/requirements.txt tests/integration/microservices/back/requirements.in
 #
 
-<<<<<<< HEAD
-=======
 opengeodeweb-back==5.*,>=5.14.3
->>>>>>> 2fa9b2a0210e12b897fbcc5cea94e9ecc9b86d45

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,4 @@`
`5`	`5`	`# pip-compile --output-file=tests/integration/microservices/back/requirements.txt tests/integration/microservices/back/requirements.in`
`6`	`6`	`#`
`7`	`7`
`8`		`-<<<<<<< HEAD`
`9`		`-=======`
`10`	`8`	`opengeodeweb-back==5.*,>=5.14.3`
`11`		`->>>>>>> 2fa9b2a0210e12b897fbcc5cea94e9ecc9b86d45`