Merge branch 'feat/create_voi' of https://github.com/Geode-solutions/Vease into feat/create_voi

SpliiT · SpliiT · commit ca3ddee2c2c5 · 2025-11-04T15:47:06.000+01:00
diff --git a/microservices/back/requirements.txt b/microservices/back/requirements.txt
@@ -5,7 +5,3 @@
 #    pip-compile --output-file=microservices/back/requirements.txt microservices/back/requirements.in
 #
 
-<<<<<<< HEAD
-=======
-vease-back==1.*,>=1.6.5
->>>>>>> 9b770f8290d4dd9654b0ec0852603f3e8f5889ce
diff --git a/microservices/viewer/requirements.txt b/microservices/viewer/requirements.txt
@@ -5,4 +5,3 @@
 #    pip-compile --output-file=microservices/viewer/requirements.txt microservices/viewer/requirements.in
 #
 
-vease-viewer==2.*,>=2.3.18

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,3 @@`
`5`	`5`	`# pip-compile --output-file=microservices/back/requirements.txt microservices/back/requirements.in`
`6`	`6`	`#`
`7`	`7`
`8`		`-<<<<<<< HEAD`
`9`		`-=======`
`10`		`-vease-back==1.*,>=1.6.5`
`11`		`->>>>>>> 9b770f8290d4dd9654b0ec0852603f3e8f5889ce`
Original file line number	Diff line number	Diff line change
`@@ -5,4 +5,3 @@`
`5`	`5`	`# pip-compile --output-file=microservices/viewer/requirements.txt microservices/viewer/requirements.in`
`6`	`6`	`#`
`7`	`7`
`8`		`-vease-viewer==2.*,>=2.3.18`