diff options
Diffstat (limited to 'usr/src/tools/scripts/git-pbchk.1')
| -rw-r--r-- | usr/src/tools/scripts/git-pbchk.1 | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/usr/src/tools/scripts/git-pbchk.1 b/usr/src/tools/scripts/git-pbchk.1 index 433c699329..8727d3ae5e 100644 --- a/usr/src/tools/scripts/git-pbchk.1 +++ b/usr/src/tools/scripts/git-pbchk.1 @@ -33,12 +33,8 @@ Check that putback comments follow the prescribed format (only run for pbchk) .TP Copyrights -<<<<<<< HEAD -Check that each source file contains a copyright notice for the current year\. You need to fix this if you, the potential new copyright holder, chooses not to -======= Check that each source file contains a copyright notice for the current year\. You don't need to fix this if you, the potential new copyright holder, chooses not to ->>>>>>> 8bcea97... 1960 developer tools should support git .TP C style |