# Conflicts: # new1.txt
@@ -1,12 +1,14 @@
<html>
<head></head>
<body>
- <h1>ÎÒÊÇh1</h1>
+ <h1>ÎÒÊÇh1</h1>
出不出现，出不出现
-
- <h3>3333</h3>
- <h4>this is a new h4</h4>
+
+ <h3>3333</h3>
+ <h4>this is a new h4</h4>
hello,world!
- hello,world3!
</body>
</html>
