From 9c0db0e9b18c4e7e7cdba8e97013266b7124a049 Mon Sep 17 00:00:00 2001 From: James Rowe Date: Thu, 9 Feb 2012 18:59:52 +0000 Subject: [PATCH] resolve conflict --- tests/test_headers.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/test_headers.py b/tests/test_headers.py index 2a9eeab..3648d1a 100644 --- a/tests/test_headers.py +++ b/tests/test_headers.py @@ -62,6 +62,8 @@ def test_ct(ct, should_be): test_ct('application/xhtml+xml', 'content_is_xhtml') test_ct('text/xml', 'content_is_xml') test_ct('application/xml', 'content_is_xml') + test_ct('application/xhtml+xml', 'content_is_xml') + test_ct('application/xhtml+xml; charset=UTF-8', 'content_is_xml') def test_content_params(self): headers = Headers({'Content-type': 'text/html; charset=UTF-8'})