extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-09 11:35:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove old nushell/merge engine-q

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

11
crates/nu-json/tests/main.rs
View File

@ -1,13 +1,5 @@
<<<<<<< HEAD
extern crate nu_json;
extern crate nu_test_support;
extern crate serde;
extern crate serde_json;
=======
// FIXME: re-enable tests
/*
>>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce
use nu_json::Value;
use regex::Regex;
use std::fs;
@ -216,8 +208,5 @@ fn test_hjson() {
panic!();
}
}
<<<<<<< HEAD
=======
*/
>>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce