update man page

kellyjonbrazil · Aug 16, 2021 · 834e523 · 834e523
1 parent 1ce5336
commit 834e523
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 5 deletions.
diff --git a/jc/man/jc.1.gz b/jc/man/jc.1.gz
diff --git 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