测试git冲突

liurunyu

2023-12-01 88cd0922634e6bb20da6ea64209bd62d094b6b4c

1
2
3
4
5
6
7
8
9
10
11
12
13
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("test3");
    }
}