diff options
| author | John Sonnenschein <johns@joyent.com> | 2012-05-17 18:26:57 +0000 |
|---|---|---|
| committer | John Sonnenschein <johns@joyent.com> | 2012-05-17 18:26:57 +0000 |
| commit | 04b244dd661c24b510ac22936decfc0972d202d3 (patch) | |
| tree | 3ebfef98afc303fddf3415d6fba64e8682f495e8 /usr/src/tools/scripts/git-pbchk.1 | |
| parent | eac250589e41f1b705e1b7427b02b3379aac9f9e (diff) | |
| parent | a69187741b83640a90dd8586195456dd50c016a8 (diff) | |
| download | illumos-joyent-20120517.tar.gz | |
Merge git.joyent.com:illumos-joyent20120517
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 |