(no subject)

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

(no subject)

Pavel Fric
The result of git pull made in my local lilypond-git, it wanted to merge, also:

pavel@localhost ~/lilypond-git (translation)$ git pull
remote: Counting objects: 113, done.
remote: Compressing objects: 100% (60/60), done.
remote: Total 60 (delta 49), reused 0 (delta 0)
Unpacking objects: 100% (60/60), done.
From git://git.sv.gnu.org/lilypond
   e593c62..f37e505  translation -> origin/translation
   5d2bd06..2365590  master     -> origin/master
   e15e0d2..2365590  staging    -> origin/staging
Merge made by the 'recursive' strategy.
 Documentation/cs/learning.tely                  |    2 +-
 Documentation/cs/learning/common-notation.itely |    2 +-
 Documentation/cs/learning/tutorial.itely        |    2 +-
 Documentation/cs/learning/tweaks.itely          |    4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)
pavel@localhost ~/lilypond-git (translation)$

--
Pavel Fric