Merge branch 'master' of git://git.sv.gnu.org/lilypond

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

diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc
index 899d22a5c725d65092c1277ca8b83d44a5bda602..f748b56a829641e5ecdece06bd80288648640868 100644 (file)
--- a/lily/rest-collision.cc
+++ b/lily/rest-collision.cc
@@ -21,6 +21,7 @@ using namespace std;
 #include "rhythmic-head.hh"
 #include "staff-symbol-referencer.hh"
 #include "stem.hh"
+#include "grob.hh"
 #include "warn.hh"
 
 MAKE_SCHEME_CALLBACK (Rest_collision, force_shift_callback, 1);
@@ -147,7 +148,7 @@ Rest_collision::calc_positioning_done (SCM smob)
          if (d)
            ordered_rests[d].push_back (rests[i]);
          else
-           rests[d]->warning (_ ("can't resolve rest collision: rest direction not set"));
+           rests[d]->warning (_ ("cannot resolve rest collision: rest direction not set"));
        }
 
       Direction d = LEFT;