From 9822f2f548dba0bd135eaa5538823f3ddaa5d322 Mon Sep 17 00:00:00 2001
From: ffr <492210217@qq.com>
Date: Tue, 9 Apr 2024 16:05:16 +0800
Subject: [PATCH]  commit upd

---
 ...pringframework.boot.autoconfigure.AutoConfiguration.imports | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/couplet-common/couplet-common-business/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/couplet-common/couplet-common-business/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 6710490..f797d3a 100644
--- a/couplet-common/couplet-common-business/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/couplet-common/couplet-common-business/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1,5 +1,2 @@
 com.couplet.remote.factory.RemoteVehicleFallbackFactory
-<<<<<<< HEAD
 com.couplet.remote.factory.RemoteTroubleFallbackFactory
-=======
->>>>>>> f07dc73 (远程调用 加自动配置扫描)