optimize: fix conflicts

Signed-off-by: slievrly <slievrly@163.com>
apache · Jul 12, 2022 · 46d75f3 · 46d75f3
2 parents f296b9f + ede95ef
commit 46d75f3
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/all/pom.xml b/all/pom.xml
@@ -26,7 +26,6 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>seata-all</artifactId>
-
     <name>Seata All-in-one ${project.version}</name>
     <description>Seata is an easy-to-use, high-performance, java based, open source distributed transaction solution.</description>