[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Conflicts in Spanish docs when merging lilypond/translation into mas
|
From: |
Francisco Vila |
|
Subject: |
Re: Conflicts in Spanish docs when merging lilypond/translation into master |
|
Date: |
Fri, 3 Oct 2008 20:32:20 +0200 |
2008/10/3 John Mandereau <address@hidden>:
> Hi Francisco,
>
> I can't merge lilypond/translation into master because it produces
> conflicts in 3 doc files in Spanish; could you merge and fix the
> conflicts yourself, and push the result to either lilypond/translation
> or master (pushing to both is better, but it's not essential)?
Done, it's my first time, sorry for the dumb commit name.
--
Francisco Vila. Badajoz (Spain)
http://www.paconet.org