nxhtml/tests/in/bug546027.html

   1 <?xml version="1.0" encoding="iso-8859-1"?>
   2 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
   3 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
   4 <html xmlns="http://www.w3.org/1999/xhtml">
   5   <head>
   6     <title></title>
   7   </head>
   8   <body>
   9
  10 <<<<<<< .working
  11 the code from my version bla bla bla...
  12 =======
  13 the version from the repo bla bla bla...
  14 >>>>>>> .merge-right.r3379
  15
  16   </body>
  17 </html>