test/hello.c

#include <stdio.h>

void main()
{
<<<<<<< HEAD
    printf("hello world\n");
    printf("hello world\n");
    printf("hello world\n");
    printf("hello world\n");
=======
>>>>>>> 20bf8d7c8a17a7354dfe3d735a034ad3ffe96ba5
    printf("nihao\n");
    printf("helloworld");
    return 0;    
}