Remove old nushell/merge engine-q

This commit is contained in:
JT
2022-02-07 14:54:06 -05:00
parent 10c4c50f1f
commit d70d91e559
430 changed files with 14543 additions and 7865 deletions

View File

@ -1,17 +1,10 @@
[package]
authors = ["The Nu Project Contributors", "Christian Zangl <laktak@cdak.net>"]
description = "Fork of serde-hjson"
<<<<<<< HEAD
edition = "2018"
license = "MIT"
name = "nu-json"
version = "0.43.0"
=======
edition = "2021"
license = "MIT"
name = "nu-json"
version = "0.37.1"
>>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce
version = "0.59.0"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@ -27,10 +20,5 @@ lazy_static = "1"
linked-hash-map = { version="0.5", optional=true }
[dev-dependencies]
<<<<<<< HEAD
nu-path = { version = "0.43.0", path="../nu-path" }
nu-test-support = { version = "0.43.0", path="../nu-test-support" }
=======
nu-path = { version = "0.37.1", path="../nu-path" }
>>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce
nu-path = { path="../nu-path", version = "0.59.0" }
serde_json = "1.0.39"