测试git冲突

liurunyu

2023-12-01 43cef17ebd5b267e12fe5aa9c955ef71e9d0f2a4

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
package com.dy.pipIrrGlobal.test;
 
public class TestConflict {
    public void test1(){
        System.out.println("test1");
    }
    public void test2(){
        System.out.println("test2");
    }
    public void test3(){
        System.out.println("test31");
        System.out.println("test32");
        System.out.println("test33");
        System.out.println("test34");
    }
}