From 13d2dca3c08afcab131a9a350a5c5ad3ff6b2bee Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 02 二月 2024 15:44:39 +0800
Subject: [PATCH] 解决部分冲突

---
 north-glass-erp/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/north-glass-erp/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
new file mode 100644
index 0000000..daf27b4
--- /dev/null
+++ b/north-glass-erp/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
@@ -0,0 +1 @@
+D:\Documents\north-glass-erp\src\test\java\com\example\erp\ErpApplicationTests.java

--
Gitblit v1.8.0