language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-27 05:49:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

fix merge conflict

Browse source
This commit is contained in:
Folkert 2022-03-26 22:08:30 +01:00
parent 9dbaa0d157
commit e19cdaf34d
No known key found for this signature in database
GPG key ID: 1F17F6FFD112B97C
1 changed files with 0 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
compiler/load_internal/tests/test_load.rs
View file

@ -88,11 +88,8 @@ mod test_load {
} }
fn multiple_modules(files: Vec<(&str, &str)>) -> Result<LoadedModule, String> { fn multiple_modules(files: Vec<(&str, &str)>) -> Result<LoadedModule, String> {
<<<<<<< HEAD:compiler/load_internal/tests/test_load.rs
=======
use roc_load_internal::file::LoadingProblem; use roc_load_internal::file::LoadingProblem;
>>>>>>> origin/trunk:compiler/load/tests/test_load.rs
let arena = Bump::new(); let arena = Bump::new();
let arena = &arena; let arena = &arena;