git-sample
| Revisão | 6fca859c64a87c4cd576b8ada1dd51fb9159eaae (tree) |
|---|---|
| Hora | 2014-08-18 01:28:24 |
| Autor | taro <taro@exam...> |
| Commiter | taro |
Merge branch 'master' of github.com:hylom/git-sample
Conflicts:
hello.html
hello.html (diff) sample.html (diff)| @@ -8,7 +8,7 @@ | ||
| 8 | 8 | <h1>Hello World!</h1> |
| 9 | 9 | <p>Hello version control, Hello Git!</p> |
| 10 | 10 | <div class="version"> |
| 11 | - <span>Version: 9.1.0</span> | |
| 11 | + <span>Version: 10</span> | |
| 12 | 12 | </div> |
| 13 | 13 | </body> |
| 14 | 14 | </html> |
| @@ -0,0 +1,14 @@ | ||
| 1 | +<!DOCTYPE html> | |
| 2 | +<html> | |
| 3 | + <head> | |
| 4 | + <title>Sample Page 02</title> | |
| 5 | + </head> | |
| 6 | + <body> | |
| 7 | + <div id="header"> | |
| 8 | + <h1>Sample Page 02</h1> | |
| 9 | + </div> | |
| 10 | + <div id="contents-body"> | |
| 11 | + <p>This is sample page #2.</p> | |
| 12 | + </div> | |
| 13 | + </body> | |
| 14 | +</html> |
hylom
Fork