From e19cdaf34d80c1b82a6f9531e8ca4850bcf67cfe Mon Sep 17 00:00:00 2001
From: Folkert <folkert@folkertdev.nl>
Date: Sat, 26 Mar 2022 22:08:30 +0100
Subject: [PATCH] fix merge conflict

---
 compiler/load_internal/tests/test_load.rs | 3 ---
 1 file changed, 3 deletions(-)

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