>>  - Intro.lyx: a couple of minor changes I overlooked previously, they are 
>> signaled with a LyX note each.
>>
>
> This file is broken, merge conflict left inside:
>
Try now with the attachment. I downloaded the upstream version of the document 
and remade the changes (beginning of section 2 and 2.2, signaled with a note 
each).

By the way, if the appearance of footnotes in LyX is not going to change, the 
lib/doc/clipart/footnote.png image should be updated. I updated locally for 
Spanish, Catalan and English, so I can provide the images if needed.


Daniel.
--
Enviat amb Tutanota.

Attachment: Intro.lyx
Description: application/lyx

-- 
lyx-docs mailing list
lyx-docs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-docs

Reply via email to