From 38af8b3ae370c24da03c9dba44d258a7027f628b Mon Sep 17 00:00:00 2001 From: Matěj Cepl Date: Thu, 21 Mar 2024 10:19:34 +0100 Subject: Add README.md and LICENSE --- LICENSE | 22 ++++++++++++++++++++++ README.md | 13 +++++++++++++ README.txt | 9 --------- 3 files changed, 35 insertions(+), 9 deletions(-) create mode 100644 LICENSE create mode 100644 README.md delete mode 100644 README.txt diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..df70f4a --- /dev/null +++ b/LICENSE @@ -0,0 +1,22 @@ +Copyright © 2022 Matěj Cepl, mcepl at cepl dot eu + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the “Software”), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. diff --git a/README.md b/README.md new file mode 100644 index 0000000..3f61ca3 --- /dev/null +++ b/README.md @@ -0,0 +1,13 @@ +Generates diff between two JSON files +===================================== + +Compares two JSON files (http://json.org) and generates a new JSON file +with the result. Allows exclusion of some keys from the comparison, or +in other way to include only some keys. + +Released under MIT/X11 license. + +All issues, questions, complaints, or (even better!) patches +should be send via email to +[~mcepl/devel@lists.sr.ht](mailto:~mcepl/devel@lists.sr.ht) email +list (for patches use [git send-email](https://git-send-email.io/)). diff --git a/README.txt b/README.txt deleted file mode 100644 index 11e0413..0000000 --- a/README.txt +++ /dev/null @@ -1,9 +0,0 @@ -Compares two JSON files (http://json.org) and generates a new JSON file -with the result. Allows exclusion of some keys from the comparison, or -in other way to include only some keys. - -The project’s website is at https://gitlab.com/mcepl/json_diff -Patches and pull requests are welcome, but please keep the script compatible -with python 2.4. - -Released under MIT/X11 license. -- cgit