merge constraints.txt

statisticsnorway · Jan 15, 2025 · 1c56142 · 1c56142
1 parent 9f6ab56
commit 1c56142
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/.github/workflows/constraints.txt b/.github/workflows/constraints.txt
@@ -1,10 +1,5 @@
 pip==24.3.1
 nox==2024.10.9
 nox-poetry==1.0.3
-<<<<<<< ours
-poetry==1.8.4
-virtualenv==20.28.0
-=======
 poetry==2.0.1
 virtualenv==20.28.1
->>>>>>> theirs