更新pom

blade-service/blade-desk/pom.xml

@@ -49,15 +49,6 @@
         <dependency>
             <groupId>com.qiniu</groupId>
             <artifactId>qiniu-java-sdk</artifactId>
-<<<<<<< HEAD
-        </dependency><dependency><groupId>org.flowable</groupId><artifactId>flowable-engine</artifactId><version>7.1.0</version><scope>compile</scope></dependency>
-<!--        <dependency>-->
-<!--            <groupId>org.springblade</groupId>-->
-<!--            <artifactId>blade-starter-transaction</artifactId>-->
-<!--        </dependency>-->
-        <dependency>
-            <groupId>org.springblade</groupId>
-=======
         </dependency>
         <dependency>
             <groupId>org.flowable</groupId>
@@ -73,7 +64,6 @@
         <!-- blade excel starter -->
         <dependency>
             <groupId>org.springblade</groupId>
->>>>>>> 643ab909e8aa4a1f71c31a70bd875a78f65bfd65
             <artifactId>blade-starter-excel</artifactId>
         </dependency>
     </dependencies>