reset gpu-workers entirely

David Cavazos · David Cavazos · commit dccd74569521 · 2021-06-28T18:21:59.000Z
diff --git a/dataflow/gpu-workers/requirements.txt b/dataflow/gpu-workers/requirements.txt
@@ -1,9 +1,4 @@
 Pillow==8.2.0
-<<<<<<< HEAD
-apache-beam[gcp]==2.30.0
-rasterio==1.2.4
-=======
 apache-beam[gcp]==2.29.0
 rasterio==1.2.6
->>>>>>> d41f2ed158db07c062562d4cf93d626781466d9a
 tensorflow==2.5.0
