From: Stefan Schantl <stefan.schantl@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] ids.cgi: Fix unmatched right curley.
Date: Thu, 03 Feb 2022 13:37:44 +0100 [thread overview]
Message-ID: <6428efea1949424f8b74709c356cff1d48aa1a88.camel@ipfire.org> (raw)
In-Reply-To: <0458fdbd-2c01-3c68-9bed-9dc06ccaa53d@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 1160 bytes --]
Hello Peter,
I've tested you changes and they do the trick.
So you are right my patch is not required anymore - I'll mark it
accordingly in patchwork.
-Stefan
> Hello Stefan,
>
> thank you for handing this in. I hope this wasn't due to my fault
> when merging
> your IDSv3 branch into temp-c164-development.
>
> Anyway, I fixed this one in
> https://git.ipfire.org/?p=ipfire-2.x.git;a=commit;h=1b939d0ecc1c9e0551a5f926e2810ae03bca5f8a
> a few days ago, so I'm afraid your patch won't be necessary. Sorry.
>
> Thanks, and best regards,
> Peter Müller
>
>
> > It seems during resolving a merge conflict this curley accidently
> > remains.
> >
> > Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
> > ---
> > html/cgi-bin/ids.cgi | 1 -
> > 1 file changed, 1 deletion(-)
> >
> > diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
> > index 161464d0d..3173eb985 100644
> > --- a/html/cgi-bin/ids.cgi
> > +++ b/html/cgi-bin/ids.cgi
> > @@ -1643,7 +1643,6 @@ END
> > END
> > ;
> > &Header::closebox();
> > - }
> > }
> >
> > #
prev parent reply other threads:[~2022-02-03 12:37 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-02 14:35 Stefan Schantl
2022-02-02 20:45 ` Peter Müller
2022-02-03 12:37 ` Stefan Schantl [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6428efea1949424f8b74709c356cff1d48aa1a88.camel@ipfire.org \
--to=stefan.schantl@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox