Merge branch 'proj/image-gen2' into TPT-2897/support-replication

yec-akamai · Jul 18, 2024 · 875b615 · 875b615
2 parents 66aa71b + 67eae22
commit 875b615
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -1,11 +1,7 @@
-<<<<<<< HEAD
 # TODO: Revert before merging to dev
 # linode-api4>=5.17.0
 git+https://github.com/linode/linode_api4-python@proj/image-gen2
 
-=======
-linode-api4>=5.18.0
->>>>>>> dev
 polling>=0.3.2
 types-requests==2.32.0.20240712
 ansible-specdoc>=0.0.15