提交: 67352759ce4c11e04156ccde589300a60bf3c76e - git_sample (git)

git-sample

Commit MetaInfo

• 修订版: 67352759ce4c11e04156ccde589300a60bf3c76e (tree)
• 时间: 2014-07-17 23:39:09
• 作者: hylom <hylom@hylo...>
• Commiter: hylom

Log Message

fix conflict in hello.html

更改概述

• modified: hello.html

差异

--- a/hello.html
+++ b/hello.html
@@ -8,6 +8,7 @@
       <h1>Hello World!</h1>
       <p>This is sample html file.</p>
       <h2>Version Infomation</h2>
+      <!-- edited by taro -->
       <p>Version 8</p>
     </body>
 </html>