Skip to content

Commit 48a5985

Browse files
committed
Resolved merge conflict by keeping README.md file.
2 parents c0bc952 + 2feaf3a commit 48a5985

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@
5454
<dependency>
5555
<groupId>com.volcengine</groupId>
5656
<artifactId>volcengine-java-sdk-bom</artifactId>
57-
<version>0.1.37</version>
57+
<version>0.1.37</version>
5858
<type>pom</type>
59-
<scope>import</scope>
59+
<scope>import</scope>
6060
</dependency>
6161
</dependencies>
6262
</dependencyManagement>
@@ -133,4 +133,4 @@ public class TestVpc {
133133
}
134134
}
135135

136-
```
136+
```

meta.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"lasted": "0.1.37",
3-
"meta_commit": "95eec105decc8a783ba0a06ec5028b1850fa7f4b"
4-
}
2+
"lasted": "0.1.37",
3+
"meta_commit": "95eec105decc8a783ba0a06ec5028b1850fa7f4b"
4+
}

0 commit comments

Comments
 (0)