Skip to content
Snippets Groups Projects
Normal view Permalink
hello.html 94 B
Newer Older
Minh Truong's avatar
change hello  
Minh Truong committed
1 
<<<<<<< HEAD
Minh Truong's avatar
change hello to blue  
Minh Truong committed
2 
hello, vblue
Minh Truong's avatar
change hello  
Minh Truong committed
3 4 5 
=======
hello, v 5
>>>>>>> 4936499919f5b50b21a7527a0ae3b0de7eaeacc3