From mboxrd@z Thu Jan 1 00:00:00 1970 From: Larsen To: development@lists.ipfire.org Subject: Re: Aw: Re: [PATCH] Fix hardcoded strings in pppsetup.cgi Date: Tue, 02 Jun 2015 23:07:48 +0200 Message-ID: In-Reply-To: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6512962643331007800==" List-Id: --===============6512962643331007800== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable On Tue, 02 Jun 2015 23:05:10 +0200, Larsen wrote: > On Tue, 02 Jun 2015 22:01:18 +0200, Michael Tremer wrote: > >> Hi, >> >> this patch looks okay, but it won't apply. Git error: >> >> Applying: Aw: Re: [PATCH] Fix hardcoded strings in pppsetup.cgi >> error: patch failed: html/cgi-bin/pppsetup.cgi:793 >> error: html/cgi-bin/pppsetup.cgi: patch does not apply >> error: patch failed: langs/de/cgi-bin/de.pl:1822 >> error: langs/de/cgi-bin/de.pl: patch does not apply >> error: patch failed: langs/en/cgi-bin/en.pl:1852 >> error: langs/en/cgi-bin/en.pl: patch does not apply >> Patch failed at 0001 Aw: Re: [PATCH] Fix hardcoded strings in pppsetup.cgi >> >> This is probably caused by copy-and-paste and replacing tabs by spaces >> or similar. > (now again without hitting Ctrl+Enter too early... damn) I saved the patch from your last reply and compared it to the original patch = file that was created by TortoiseGit. There were no differences. I also patched pppsetup.cgi in my VM with Core 90 (didn=C2=B4t try for the la= ng files) and this also went fine. There are no tabs in the patch. I don=C2=B4t know what could be wrong with it... =3D( --===============6512962643331007800==--