Merge pull request #159 from kellyjonbrazil/master

Sync Master to dev
2026-04-24 20:56:11 +02:00 · 2021-08-26 10:01:08 -07:00
parent 473f70668f 834e52369c
commit 700916276a
3 changed files with 1 additions and 5 deletions
@@ -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