8000 Resolved merge conflicts in requirements.txt files · Peastar/python-docs-samples@a0605f5 · GitHub
[go: up one dir, main page]
10000
Skip to content

Commit a0605f5

Browse files
engelkeengelke
committed
Resolved merge conflicts in requirements.txt files
2 parents ea0a2bd + 2a83c8f commit a0605f5

File tree

23 files changed

+23
-23
lines changed

23 files changed

+23
-23
lines changed

‎appengine/flexible/storage/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
Flask==1.1.2
2-
google-cloud-storage==1.29.0
2+
google-cloud-storage==1.30.0
33
gunicorn==20.0.4; python_version > '3.0'
44
gunicorn==19.10.0; python_version < '3.0'

‎appengine/standard/migration/storage/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
google-cloud-storage==1.29.0
1+
google-cloud-storage==1.30.0
22
Flask==1.1.1

‎auth/cloud-client/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
google-cloud-storage==1.29.0
1+
google-cloud-storage==1.30.0

‎automl/cloud-client/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
google-cloud-automl==1.0.1
2-
google-cloud-storage==1.29.0
2+
google-cloud-storage==1.30.0

‎codelabs/flex_and_vision/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ Flask==1.1.2
22
gunicorn==20.0.4; python_version > '3.0'
33
gunicorn==19.10.0; python_version < '3.0'
44
google-cloud-vision==1.0.0
5-
google-cloud-storage==1.29.0
5+
google-cloud-storage==1.30.0
66
google-cloud-datastore==1.13.2

‎dataproc/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ grpcio==1.31.0
22
google-auth==1.20.1
33
google-auth-httplib2==0.0.4
44
google-cloud==0.34.0
5-
google-cloud-storage==1.29.0
5+
google-cloud-storage==1.30.0
66
google-cloud-dataproc==1.0.1

‎dlp/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
google-cloud-dlp==1.0.0
2-
google-cloud-storage==1.29.0
2+
google-cloud-storage==1.30.0
33
google-cloud-pubsub==1.7.0
44
google-cloud-datastore==1.13.2
55
google-cloud-bigquery==1.25.0

‎document/cloud-client/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
google-cloud-documentai==0.2.0
2-
google-cloud-storage==1.29.0
2+
google-cloud-storage==1.30.0

‎functions/http/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
google-cloud-storage==1.29.0
1+
google-cloud-storage==1.30.0
22
xmltodict==0.12.0

‎functions/imagemagick/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
google-cloud-vision==1.0.0
2-
google-cloud-storage==1.29.0
2+
google-cloud-storage==1.30.0
33
Wand==0.6.2

0 commit comments

Comments
 (0)
0