resolve merge

[lilypond.git] / lily / score-engraver.cc

diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc
index eff35efed4173fb2666a69a383970d569f5b495a..ade345e6d0b2ba7f13793b8be9d3cfba3b3f994d 100644 (file)
--- a/lily/score-engraver.cc
+++ b/lily/score-engraver.cc
@@ -1,9 +1,20 @@
 /*
-  score-engraver.cc -- implement Score_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "score-engraver.hh"
@@ -189,8 +200,7 @@ ADD_TRANSLATOR_GROUP (Score_engraver,
                      
                      /* read */
                      "currentMusicalColumn "
-                     "currentCommandColumn "
-                     "verticallySpacedContexts ",
+                     "currentCommandColumn ",
 
                      /* write */
                      ""