Le 13/05/2020 à 10:56, Joel Kulesza a écrit :
On Wed, May 13, 2020 at 2:35 AM Jean-Marc Lasgouttes <lasgout...@lyx.org <mailto:lasgout...@lyx.org>> wrote:

    Le 13/05/2020 à 08:39, Jürgen Spitzmüller a écrit :
     > Am Dienstag, den 12.05.2020, 20:07 +0200 schrieb Jean-Marc
    Lasgouttes:
     >> This would be the patch below
     >
     > pas de patch ci-dessous

    Le voilà Monseigneur.


Awesome, thanks for the discussion and quick work on this!  However, a dumb question:

How do you apply that patch?

With 'git am'.

JMarc

When I try with `git apply`, it claims it doesn't apply (see below my signature).  I'm working from master at 2663e3845e6cc33ec543510aec16c7a37841e26d.  This is a straightforward change, so I'm surprised to see a problem (unless I'm that problem).

Thanks,
Joel

--

> git apply --check 0001-Use-combined-toolbar-icons-for-depth-in-de-crement-a.patch
error: patch failed: lib/ui/stdtoolbars.inc:124
error: lib/ui/stdtoolbars.inc: patch does not apply

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

Reply via email to