From: Francisco Vila <francisco.vila@hispalinux.es>
Date: Tue, 9 Jun 2009 09:03:26 +0000 (+0200)
Subject: lily/paper-column.cc, prevent conflict on further merge
X-Git-Tag: release/2.13.2-0~19^2~2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=741b1bcfd22532d701989925ad22f4b590506777;p=lilypond.git

lily/paper-column.cc, prevent conflict on further merge

Ease merging of master into lilypond/translation, by parts.
---

diff --git a/lily/paper-column.cc b/lily/paper-column.cc
index d153dcefb5..e8533e9453 100644
--- a/lily/paper-column.cc
+++ b/lily/paper-column.cc
@@ -348,6 +348,7 @@ ADD_INTERFACE (Paper_column,
 	       " non-musical, to which musical and non-musical objects are"
 	       " attached respectively.  The spacing engine determines the"
 	       " X@tie{}positions of these objects.\n"
+	       "\n"
 	       "They are numbered, the first (leftmost) is column@tie{}0."
 	       "  Numbering happens before line breaking, and columns are not"
 	       " renumbered after line breaking.  Since many columns go"