[openssh-commits] [openssh] 02/02: upstream: Move RCSID to before license block and away from #includes,

git+noreply at mindrot.org git+noreply at mindrot.org
Mon Jul 17 15:24:29 AEST 2023


This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit ebe11044681caff78834ca6b78311ad19c1860b8
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Mon Jul 17 05:22:30 2023 +0000

    upstream: Move RCSID to before license block and away from #includes,
    
    where it caused merge conflict in -portable for each commit :(
    
    OpenBSD-Commit-ID: 756ebac963df3245258b962e88150ebab9d5fc20
---
 krl.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/krl.c b/krl.c
index caedb4f1..e2efdf06 100644
--- a/krl.c
+++ b/krl.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: krl.c,v 1.59 2023/07/17 05:22:30 djm Exp $ */
 /*
  * Copyright (c) 2012 Damien Miller <djm at mindrot.org>
  *
@@ -14,8 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $OpenBSD: krl.c,v 1.58 2023/07/17 05:20:15 djm Exp $ */
-
 #include "includes.h"
 
 #include <sys/types.h>

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.


More information about the openssh-commits mailing list