Resolved merge conflict by keeping README.md file.

volcengine · Mar 8, 2023 · 48a5985 · 48a5985
2 parents c0bc952 + 2feaf3a
commit 48a5985
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -54,9 +54,9 @@
     <dependency>
       <groupId>com.volcengine</groupId>
 	  <artifactId>volcengine-java-sdk-bom</artifactId>
-       <version>0.1.37</version>
+          <version>0.1.37</version>
 	  <type>pom</type>
-      <scope>import</scope>
+          <scope>import</scope>
     </dependency>
   </dependencies>
 </dependencyManagement>
@@ -133,4 +133,4 @@ public class TestVpc {
   }
 }
 
-```
+```
diff --git a/meta.json b/meta.json
@@ -1,4 +1,4 @@
 {
-	"lasted": "0.1.37",
-	"meta_commit": "95eec105decc8a783ba0a06ec5028b1850fa7f4b"
-}
+  "lasted": "0.1.37",
+  "meta_commit": "95eec105decc8a783ba0a06ec5028b1850fa7f4b"
+}