From 94d2fc1815a919734353c942f224db1de4b4fcb8 Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Mon, 7 Mar 2011 09:04:49 +0100 Subject: Django, org * Added nxhtml, mostly for django support. * Changed some org settings. --- emacs.d/nxhtml/tests/in/bug546027.html | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create 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 new file mode 100644 index 0000000..f0c0eac --- /dev/null +++ b/emacs.d/nxhtml/tests/in/bug546027.html @@ -0,0 +1,17 @@ + + + + + + + + +<<<<<<< .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