git-sample
| Revisão | 1f71b282bcc0acdc3e20d7a7ff55e5aa85086d86 (tree) |
|---|---|
| Hora | 2014-07-17 23:51:14 |
| Autor | hylom <hylom@hylo...> |
| Commiter | hylom |
Merge branch 'master' of github.com:hylom/git-sample
Conflicts:
hello.html
hello.html (diff)| @@ -6,10 +6,9 @@ | ||
| 6 | 6 | </head> |
| 7 | 7 | <body> |
| 8 | 8 | <h1>Hello World!</h1> |
| 9 | - <p>This is sample html file.</p> | |
| 10 | - <h2>Version Infomation</h2> | |
| 11 | - <!-- edited by taro --> | |
| 12 | - <p>Version 8</p> | |
| 9 | + <p>Hello version control, Hello Git!</p> | |
| 10 | + <h2>Version Information</h3> | |
| 11 | + <p>Version 9.1</p> | |
| 13 | 12 | </body> |
| 14 | 13 | </html> |
| 15 | 14 |
hylom
Fork