Skip to content

Commit 4883322

Browse files
committed
pull origin main
2 parents 7b1deaa + 625638c commit 4883322

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@
66

77
<groupId>com.uid2</groupId>
88
<artifactId>uid2-operator</artifactId>
9+
<<<<<<< HEAD
910
<version>5.62.16-alpha-583-SNAPSHOT</version>
11+
=======
12+
<version>5.62.22</version>
13+
>>>>>>> 625638cbc5c81bd1d959d6225d499f25af0a48a7
1014

1115
<properties>
1216
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

scripts/aws/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
requests[socks]==2.32.3
22
boto3==1.35.59
3-
urllib3==1.26.20
3+
urllib3==2.6.0
44
PyYAML===6.0.2

0 commit comments

Comments
 (0)