Resolve conflict

[lilypond.git] / input / lsr / paper-and-layout-intro.itely

diff --git a/input/lsr/paper-and-layout-intro.itely b/input/lsr/paper-and-layout-intro.itely
index 83c9ed7e7dded19627d08c478e1016d0cb3c4e90..5b654b797f4744479abb1da630f5100d83a3de63 100644 (file)
--- a/input/lsr/paper-and-layout-intro.itely
+++ b/input/lsr/paper-and-layout-intro.itely
@@ -1,4 +1,3 @@
-\version "2.11.51"
 @node Paper and layout
 @unnumbered Paper and layout