From: Marcin Koziej <marcinkoziej@nowoczesnapolska.org.pl>
Date: Mon, 3 Feb 2014 14:06:46 +0000 (+0100)
Subject: merge conflicting on stripping spaces
X-Git-Url: https://git.mdrn.pl/librarian.git/commitdiff_plain/refs/heads/publication

merge conflicting on stripping spaces
---

134f8c2e9895aae155922f2b6bef9144ded7dfdc
diff --cc librarian/pdf/wl2tex.xslt
index cffb8da,635029b..fd14d5c
--- a/librarian/pdf/wl2tex.xslt
+++ b/librarian/pdf/wl2tex.xslt
@@@ -331,7 -331,7 +331,8 @@@
  <!-- = INLINE TAGS                                  = -->
  <!-- = (contain other inline tags and special tags) = -->
  <!-- ================================================ -->
 -<xsl:strip-space elements="wyroznienie|akap|nota"/>
++
 +<xsl:strip-space elements="nota|akap|wyroznienie"/>
  
  <xsl:template mode="inline"
      match="pa|pe|pr|pt|mat|didask_tekst|slowo_obce|wyroznienie|osoba|punkt|www|nota_red">