*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index db229c8f0e81f9781d51c9815c899b4cc221e0cf..41d04bf40dbf71bc00ad63abb936107a2a2f5f4e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -48,7 +48,6 @@
        * scm/paper.scm (layout-set-staff-size): increase blotdiameter to
        0.4pt.
 
->>>>>>> 1.3297
 2005-03-13  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * ly/titling-init.ly (bookTitleMarkup): Refinements.

diff --git a/lily/beam.cc b/lily/beam.cc
index 9eac207bb4623d3dcd19a10621f7c36640099612..fc02627a2eac0867b8bee7b7c17bdd619ef2ecb8 100644 (file)
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -172,18 +172,18 @@ Beam::before_line_breaking (SCM smob)
   return SCM_EOL;
 }
 
-/*
-  We want a maximal number of shared beams, but if there is choice, we
-  take the one that is closest to the end of the stem. This is for situations like
-
-       x
-      |
-      |
-  |===|
-  |=
-  |
-  x
-*/
+/* We want a maximal number of shared beams, but if there is choice, we
+ * take the one that is closest to the end of the stem. This is for
+ * situations like
+ *
+ *        x
+ *       |
+ *       |
+ *   |===|
+ *   |=
+ *   |
+ *  x
+ */
 int
 position_with_maximal_common_beams (SCM left_beaming, SCM right_beaming,
                                    Direction left_dir,