Merge branch 'master' into dev/jmandereau

[lilypond.git] / lily / note-collision.cc

diff --git a/lily/note-collision.cc b/lily/note-collision.cc
index 6feb71c8633f0e00f26e4f59c5bc32dbf44f4a20..5ba8fe4872ad9c27f3e70db15aa863a3845a3a5e 100644 (file)
--- a/lily/note-collision.cc
+++ b/lily/note-collision.cc
@@ -434,8 +434,7 @@ Note_collision_interface::get_clash_groups (Grob *me)
 */
 SCM
 Note_collision_interface::automatic_shift (Grob *me,
-                                          Drul_array < vector<Grob*>
-                                          > clash_groups)
+                                          Drul_array<vector<Grob*> > clash_groups)
 {
   Drul_array < vector<int> > shifts;
   SCM tups = SCM_EOL;
@@ -576,7 +575,6 @@ ADD_INTERFACE (Note_collision_interface,
               "@code{force-hshift} and @code{horizontal-shift}.",
 
               /* properties */
-              "ignore-collision "
               "merge-differently-dotted "
               "merge-differently-headed "
               "positioning-done ");