From 0d342f0aee3f2f800e486c0051dabe718a7b2841 Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Wed, 23 Mar 2011 11:14:27 +0100 Subject: I don't like nxhtml --- emacs.d/nxhtml/tests/in/bug546027.html | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 emacs.d/nxhtml/tests/in/bug546027.html (limited to 'emacs.d/nxhtml/tests/in/bug546027.html') 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 @@ - - - - - - - - -<<<<<<< .working -the code from my version bla bla bla... -======= -the version from the repo bla bla bla... ->>>>>>> .merge-right.r3379 - - - -- cgit v1.2.3-54-g00ecf