From fdebfbd80e6268e0c5ff3a0591e5c039bdf4b5b0 Mon Sep 17 00:00:00 2001 From: Andras Schmelczer Date: Wed, 9 Jul 2025 22:35:57 +0100 Subject: [PATCH] Update cargo toml metadata --- Cargo.toml | 8 +++++++- LICENSE | 21 +++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 LICENSE diff --git a/Cargo.toml b/Cargo.toml index 34fed46..9ae8296 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,11 +1,17 @@ [package] name = "reconcile" +description = "Think diff3 or git merge, but with automated conflict resolution that requires no user intervention" +version = "0.4.2" rust-version = "1.85" authors = ["Andras Schmelczer "] edition = "2024" license = "MIT" +readme = "README.md" repository = "https://github.com/schmelczer/reconcile" -version = "0.4.2" +homepage = "https://schmelczer.dev/reconcile" +keywords = ["merge", "OT", "CRDT", "3-way", "diff"] +categories = ["wasm", "text-processing", "text-editors", "algorithms", "data-structures"] +exclude = ["reconcile-js", ".*", "examples/website"] [lib] crate-type = ["cdylib", "rlib"] diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..24d84a4 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2025 AndrĂ¡s Schmelczer + +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.