17 lines
387 B
HTML
17 lines
387 B
HTML
<?xml version="1.0" encoding="iso-8859-1"?>
|
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
|
|
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
|
|
<html xmlns="http://www.w3.org/1999/xhtml">
|
|
<head>
|
|
<title></title>
|
|
</head>
|
|
<body>
|
|
|
|
<<<<<<< .working
|
|
the code from my version bla bla bla...
|
|
=======
|
|
the version from the repo bla bla bla...
|
|
>>>>>>> .merge-right.r3379
|
|
|
|
</body>
|
|
</html>
|