Skip to content

G
git-practice-sam
Commit 759762dc by sam_qiu
Options

Merge branch 'master' into 'branch2' 

# Conflicts:
#   index.html
parents c57e7231 7264a6fc
Showing with 1 additions and 2 deletions
index.html
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
</head> </head>
<body> <body>
<h1>This is startup</h1> <h1>This is startup</h1>
<p>This is branch 2</p> <p>Branch Tree 1</p>
<p>h2 commit 1st...</p>
</body> </body>
</html> </html>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment