From 43cef17ebd5b267e12fe5aa9c955ef71e9d0f2a4 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 01 十二月 2023 15:16:20 +0800
Subject: [PATCH] 测试git冲突
---
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 b293651..bc9b3b2 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
@@ -10,5 +10,7 @@
public void test3(){
System.out.println("test31");
System.out.println("test32");
+ System.out.println("test33");
+ System.out.println("test34");
}
}
--
Gitblit v1.8.0