diff --git a/jc/man/jc.1.gz b/jc/man/jc.1.gz index c857ff2bf..c26c40ff1 100644 Binary files a/jc/man/jc.1.gz and b/jc/man/jc.1.gz differ diff --git a/man/jc.1 b/man/jc.1 index 521de35d4..186e02e20 100644 --- a/man/jc.1 +++ b/man/jc.1 @@ -1,8 +1,4 @@ -<<<<<<< HEAD -.TH jc 1 2021-08-13 1.16.1 "JSON CLI output utility" -======= -.TH jc 1 2021-07-22 1.16.0 "JSON CLI output utility" ->>>>>>> master +.TH jc 1 2021-08-16 1.16.1 "JSON CLI output utility" .SH NAME jc \- JSONifies the output of many CLI tools and file-types .SH SYNOPSIS diff --git a/man/jc.1.gz b/man/jc.1.gz index c857ff2bf..c26c40ff1 100644 Binary files a/man/jc.1.gz and b/man/jc.1.gz differ