From c4b2e87c19abdb5b8b6ef715a633590f2178d6c6 Mon Sep 17 00:00:00 2001
From: Lachlan Sneff <lachlan.sneff@gmail.com>
Date: Mon, 26 Nov 2018 00:08:33 -0500
Subject: [PATCH] Finish merging

---
 src/apis/emscripten/mod.rs | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/src/apis/emscripten/mod.rs b/src/apis/emscripten/mod.rs
index 0a8c9737b..51120a7f5 100644
--- a/src/apis/emscripten/mod.rs
+++ b/src/apis/emscripten/mod.rs
@@ -159,7 +159,6 @@ pub fn generate_emscripten_env<'a, 'b>() -> ImportObject<&'a str, &'b str> {
         "env",
         "___syscall140",
         ImportValue::Func(syscalls::___syscall140 as *const u8),
-<<<<<<< HEAD
     );
     import_object.set(
         "env",
@@ -173,21 +172,6 @@ pub fn generate_emscripten_env<'a, 'b>() -> ImportObject<&'a str, &'b str> {
     );
     import_object.set(
         "env",
-=======
-    );
-    import_object.set(
-        "env",
-        "___syscall145",
-        ImportValue::Func(syscalls::___syscall145 as *const u8),
-    );
-    import_object.set(
-        "env",
-        "___syscall146",
-        ImportValue::Func(syscalls::___syscall146 as *const u8),
-    );
-    import_object.set(
-        "env",
->>>>>>> Add some syscalls
         "___syscall221",
         ImportValue::Func(syscalls::___syscall221 as *const u8),
     );
@@ -236,13 +220,8 @@ pub fn generate_emscripten_env<'a, 'b>() -> ImportObject<&'a str, &'b str> {
     );
     import_object.set(
         "env",
-<<<<<<< HEAD
         "nullFunc_iii",
         ImportValue::Func(nullfunc::nullfunc_iii as *const u8),
-=======
-        "nullFunc_iiii",
-        ImportValue::Func(nullfunc::nullfunc_iiii as *const u8),
->>>>>>> Add some syscalls
     );
     import_object.set(
         "env",