diff options
| author |  Tom Willemsen | 2011-03-23 11:14:27 +0100 |
|---|---|---|
| committer | Tom Willemsen | 2011-03-23 11:14:27 +0100 |
| commit | 0d342f0aee3f2f800e486c0051dabe718a7b2841 (patch) | |
| tree | 1f55afabb8f4876dbe564f7ed5d8e573ddc78df3 /emacs.d/nxhtml/tests/in/bug546027.html | |
| parent | d4510153b17625a3dd2f1852cc6392fc26efecf6 (diff) | |
| download | dotfiles-0d342f0aee3f2f800e486c0051dabe718a7b2841.tar.gz dotfiles-0d342f0aee3f2f800e486c0051dabe718a7b2841.zip | |
I don't like nxhtml
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> |