diff options
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/uts/common/fs/proc/prsubr.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/usr/src/uts/common/fs/proc/prsubr.c b/usr/src/uts/common/fs/proc/prsubr.c index 44ed9c4de3..08aee63610 100644 --- a/usr/src/uts/common/fs/proc/prsubr.c +++ b/usr/src/uts/common/fs/proc/prsubr.c @@ -21,11 +21,7 @@ /* * Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved. -<<<<<<< HEAD * Copyright 2019 Joyent, Inc. -======= - * Copyright 2017, Joyent, Inc. ->>>>>>> 91a7ed35601b9dac7c03b16025b401dc9f7a6bbd * Copyright 2020 OmniOS Community Edition (OmniOSce) Association. */ |