/**
 * @author https://github.com/xuzhixing181
 */
public class CommonTest {
    public static void main(String[] args) {
        System.out.println("dev03 branch,测试分支之间的冲突和合并");
        System.out.println("dev03 branch~~~OK!" +
                "");
    }
}