* [PATCH] ids.cgi: Fix unmatched right curley.
@ 2022-02-02 14:35 Stefan Schantl
2022-02-02 20:45 ` Peter Müller
0 siblings, 1 reply; 3+ messages in thread
From: Stefan Schantl @ 2022-02-02 14:35 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 427 bytes --]
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();
- }
}
#
--
2.30.2
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] ids.cgi: Fix unmatched right curley.
2022-02-02 14:35 [PATCH] ids.cgi: Fix unmatched right curley Stefan Schantl
@ 2022-02-02 20:45 ` Peter Müller
2022-02-03 12:37 ` Stefan Schantl
0 siblings, 1 reply; 3+ messages in thread
From: Peter Müller @ 2022-02-02 20:45 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 868 bytes --]
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();
> - }
> }
>
> #
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] ids.cgi: Fix unmatched right curley.
2022-02-02 20:45 ` Peter Müller
@ 2022-02-03 12:37 ` Stefan Schantl
0 siblings, 0 replies; 3+ messages in thread
From: Stefan Schantl @ 2022-02-03 12:37 UTC (permalink / raw)
To: development
[-- 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();
> > - }
> > }
> >
> > #
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-02-03 12:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-02 14:35 [PATCH] ids.cgi: Fix unmatched right curley Stefan Schantl
2022-02-02 20:45 ` Peter Müller
2022-02-03 12:37 ` Stefan Schantl
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox