diff options
Diffstat (limited to 'crates/shirabe/tests/json')
| -rw-r--r-- | crates/shirabe/tests/json/json_file_test.rs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/crates/shirabe/tests/json/json_file_test.rs b/crates/shirabe/tests/json/json_file_test.rs index aea34ba..cd4445c 100644 --- a/crates/shirabe/tests/json/json_file_test.rs +++ b/crates/shirabe/tests/json/json_file_test.rs @@ -503,7 +503,6 @@ fn test_composer_lock_file_merge_conflict_simple_crlf() { } #[test] -#[ignore] fn test_composer_lock_file_merge_conflict_complex() { // complex files have multiple conflict markers and can thus not be simply resolved let data = @@ -514,7 +513,6 @@ fn test_composer_lock_file_merge_conflict_complex() { } #[test] -#[ignore] fn test_composer_lock_file_merge_conflict_complex_crlf() { // complex files have multiple conflict markers and can thus not be simply resolved let data = std::fs::read_to_string(fixture_path( |