resolve conflict

JNRowe-retired-forks · Feb 10, 2012 · 9c0db0e · 9c0db0e
1 parent bc08174
commit 9c0db0e
Showing 1 changed file with 2 additions and 0 deletions.
diff --git 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'})