diff mbox series

ids.cgi: Fix unmatched right curley.

Message ID 20220202143549.3407775-1-stefan.schantl@ipfire.org
State Deferred
Headers
Series ids.cgi: Fix unmatched right curley. |

Commit Message

Stefan Schantl Feb. 2, 2022, 2:35 p.m. UTC 
  It seems during resolving a merge conflict this curley accidently
remains.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
---
 html/cgi-bin/ids.cgi | 1 -
 1 file changed, 1 deletion(-)

Comments

Peter Müller Feb. 2, 2022, 8:45 p.m. UTC | #1 
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@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();
> -	}
>   }
>   
>   #
Stefan Schantl Feb. 3, 2022, 12:37 p.m. UTC | #2 
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@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();
> > -       }
> >   }
> >   
> >   #
diff mbox series

Patch

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();
-	}
 }
 
 #