git: 057a5704a32a - stable/11 - copyrights: Happy New Year 2021

[Glen Barber]

The branch stable/11 has been updated by gjb:

URL: https://cgit.FreeBSD.org/src/commit/?id=057a5704a32a3495c35ae8d80b64d4ecd2ee6ac0

commit 057a5704a32a3495c35ae8d80b64d4ecd2ee6ac0
Author:     Glen Barber <gjb at FreeBSD.org>
AuthorDate: 2020-12-31 15:44:24 +0000
Commit:     Glen Barber <gjb at FreeBSD.org>
CommitDate: 2020-12-31 15:44:24 +0000

    copyrights: Happy New Year 2021
    
    Good riddance 2020.
    (This fixes the previous MFC)
    
    Sponsored by:   Rubicon Communications, LLC (netgate.com)
---
 COPYRIGHT           | 1 +
 sys/sys/copyright.h | 6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/COPYRIGHT b/COPYRIGHT
index 3cf4fa961551..18faf948fbba 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,3 +1,4 @@
+# $FreeBSD$
 #	@(#)COPYRIGHT	8.2 (Berkeley) 3/21/94
 
 The compilation of software known as FreeBSD is distributed under the
diff --git a/sys/sys/copyright.h b/sys/sys/copyright.h
index 8df68cbc4aec..dfcd2dc013cc 100644
--- a/sys/sys/copyright.h
+++ b/sys/sys/copyright.h
@@ -1,11 +1,7 @@
 /*-
-<<<<<<< HEAD
- * Copyright (C) 1992-2020 The FreeBSD Project. All rights reserved.
-=======
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
  * Copyright (C) 1992-2021 The FreeBSD Project. All rights reserved.
->>>>>>> c3e89a30fdc... copyrights: Happy New Year 2021
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -27,6 +23,8 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * $FreeBSD$
  */