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

engine-q merge

Browse Source
This commit is contained in:
Fernando Herrera
2022-02-07 19:11:34 +00:00
parent 265ee1281d 9259a56a28
commit fdce6c49ab
1965 changed files with 119062 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +1,13 @@
<<<<<<< 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;
@ -211,3 +216,8 @@ fn test_hjson() {
panic!();
}
}
<<<<<<< HEAD
=======
*/
>>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce