...
 
Commits (2)
......@@ -2,6 +2,10 @@
int main(int argc, char* argv[], char* envp[])
{
<<<<<<< HEAD
printf("haallo world!\n");
=======
printf("haaaallo world!\n");
>>>>>>> 7f30cb46f087ab075ed574892dd71389f223d3d7
return 0;
}