From 60bd6a383b3f7c0d4922517974da9525a0166b68 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 07 十二月 2023 10:45:36 +0800
Subject: [PATCH] 文件误删除后，本地重新找回后提交
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestConflict.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestConflict.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestConflict.java
index 80259bf..c672194 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestConflict.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestConflict.java
@@ -11,5 +11,7 @@
System.out.println("test31");
System.out.println("test32");
System.out.println("test33");
+ System.out.println("test34");
+ System.out.println("test33");
}
}
--
Gitblit v1.8.0