jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-11-26 20:12:44 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

copyrights: Happy New Year 2021

Browse Source 
Good riddance 2020.
(This fixes the previous MFC)

Sponsored by:	Rubicon Communications, LLC (netgate.com)
This commit is contained in:
Glen Barber 2020-12-31 10:44:24 -05:00
parent 446867bf80
commit 057a5704a3
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
COPYRIGHT
View File

@ -1,3 +1,4 @@
# $FreeBSD$
# @(#)COPYRIGHT 8.2 (Berkeley) 3/21/94
The compilation of software known as FreeBSD is distributed under the

6
sys/sys/copyright.h
View File

@ -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$
*/