[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Conflicts in Spanish docs when merging lilypond/translation into master
|
From: |
John Mandereau |
|
Subject: |
Conflicts in Spanish docs when merging lilypond/translation into master |
|
Date: |
Fri, 03 Oct 2008 19:50:43 +0200 |
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)?
Thanks in advance
John
- Conflicts in Spanish docs when merging lilypond/translation into master,
John Mandereau <=