Remove git merge markers

Co-authored-by: Ms2ger <[email protected]>
WebAssembly · Nov 5, 2021 · 4ca714e · 4ca714e
1 parent e2eacab
commit 4ca714e
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/document/js-api/index.bs b/document/js-api/index.bs
@@ -898,7 +898,6 @@ which can be simultaneously referenced by multiple {{Instance}} objects. Each
     1. If |s| equals "anyfunc", return [=funcref=].
     1. If |s| equals "externref", return [=externref=].
     1. Assert: This step is not reached.
->>>>>>> upstream/master
 </div>
 
 <div algorithm>