diff options
Diffstat (limited to 'emacs.d/nxhtml/tests/in/bug546027.html')
| -rw-r--r-- | emacs.d/nxhtml/tests/in/bug546027.html | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/emacs.d/nxhtml/tests/in/bug546027.html b/emacs.d/nxhtml/tests/in/bug546027.html deleted file mode 100644 index f0c0eac..0000000 --- a/emacs.d/nxhtml/tests/in/bug546027.html +++ /dev/null @@ -1,17 +0,0 @@ -<?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> |