增加了一段文字

whomad · Jun 1, 2016 · 1f3951b · 1f3951b
2 parents 836b0ff + 352f895
commit 1f3951b
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/githubtest.html b/githubtest.html
@@ -15,8 +15,13 @@
 			<li>眼色</li>
 			<li>说谎</li>
 		</ul>
+<<<<<<< HEAD
 		<a href="">想带上你私奔，奔向最遥远城镇，想带上你私奔，去做最幸福的人.</a>
 		<p>我曾拥有你，真叫我心酸</p>
 		<p>我没有说谎，我哪有说谎.</p>
+=======
+		<a href="">想带上你私奔，奔向最遥远城镇</a>
+		<p>洁癖，我有感情洁癖</p>
+>>>>>>> 352f895d7f6dd6c860eb8fd4f59c84beda7383a5
 	</body>
 </html>