Merge remote-tracking branch 'origin/master'

wuzeyu

2024-05-09 a04797899856a822c792530d0d65e88b3622ddd7

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
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");
        System.out.println("test33");
    }
}