git-sample
| Revisão | 67352759ce4c11e04156ccde589300a60bf3c76e (tree) |
|---|---|
| Hora | 2014-07-17 23:39:09 |
| Autor | hylom <hylom@hylo...> |
| Commiter | hylom |
fix conflict in hello.html
hello.html (diff)| @@ -8,6 +8,7 @@ | ||
| 8 | 8 | <h1>Hello World!</h1> |
| 9 | 9 | <p>This is sample html file.</p> |
| 10 | 10 | <h2>Version Infomation</h2> |
| 11 | + <!-- edited by taro --> | |
| 11 | 12 | <p>Version 8</p> |
| 12 | 13 | </body> |
| 13 | 14 | </html> |
hylom
Fork