diff --git a/samples/snippets/requirements.txt b/samples/snippets/requirements.txt index c8e8bbae..16f45f97 100644 --- a/samples/snippets/requirements.txt +++ b/samples/snippets/requirements.txt @@ -1,9 +1,3 @@ -<<<<<<< HEAD -google-cloud-translate==3.0.0 +oogle-cloud-translate==3.0.0 google-cloud-storage==1.30.0 google-cloud-automl==1.0.1 -======= -google-cloud-translate==2.0.1 -google-cloud-storage==1.29.0 -google-cloud-automl==0.10.0 ->>>>>>> 1a45813d (chore(deps): update dependency google-cloud-storage to v1.28.0 [(#3260)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/3260))