Commit 53b30e7c authored by qaomia's avatar qaomia
Browse files

fix conflicts

parent ad43df76
...@@ -2,12 +2,7 @@ ...@@ -2,12 +2,7 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xs="http://www.w3.org/2001/XMLSchema"
exclude-result-prefixes="xs" exclude-result-prefixes="xs"
<<<<<<< 0bbcab183e98cc176614025950186e8d2c62bf54
version="2.0">
=======
xmlns="http://www.utc.fr/ics/hdoc/xhtml" xmlns="http://www.utc.fr/ics/hdoc/xhtml"
version="2.0" xpath-default-namespace="http://www.w3.org/1999/xhtml"> version="2.0" xpath-default-namespace="http://www.w3.org/1999/xhtml">
<xsl:output method="xml" indent="yes"></xsl:output> <xsl:output method="xml" indent="yes"></xsl:output>
...@@ -32,5 +27,4 @@ ...@@ -32,5 +27,4 @@
<xsl:template match="*"> <xsl:template match="*">
<xsl:comment>Balise inconnue</xsl:comment> <xsl:comment>Balise inconnue</xsl:comment>
</xsl:template> </xsl:template>
>>>>>>> xsl xhtml2hdoc added </xsl:stylesheet>
</xsl:stylesheet>
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment