test01.txt 269 B

12345678910111213
  1. <body>
  2. <html>
  3. <p>hello world!</p>
  4. <h1>welcome to git world</h1>
  5. <h2>ÕâÊÇÒ»¸öÐÂÊÀ½ç</h2>
  6. <h3>new world</h3>
  7. <<<<<<< HEAD
  8. <h4> a new world</h4>
  9. =======
  10. <h5>a new world</h5>
  11. >>>>>>> 6e4bd0a64a25095899c00c8e5ba498dbdd1edb1a
  12. </html>
  13. </body>