From 6876ee803d266adee2f7a703147427d77f518656 Mon Sep 17 00:00:00 2001 From: Andreas Rossberg Date: Mon, 28 Jun 2021 09:15:37 +0200 Subject: [PATCH] Fix merge artefact --- README.md | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/README.md b/README.md index ecf80ff301..652d636391 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ -<<<<<<< HEAD [![Build Status](https://travis-ci.org/WebAssembly/multi-memory.svg?branch=master)](https://travis-ci.org/WebAssembly/multi-memory) # Multi Memory Proposal for WebAssembly @@ -11,22 +10,6 @@ It is meant for discussion, prototype specification and implementation of a prop * See the [modified spec](https://webassembly.github.io/multi-memory/) for details. Original `README` from upstream repository follows… -======= -[![Build Status](https://travis-ci.org/WebAssembly/reference-types.svg?branch=master)](https://travis-ci.org/WebAssembly/reference-types) - -# Reference Types Proposal for WebAssembly - -This repository is a clone of [github.com/WebAssembly/spec/](https://github.com/WebAssembly/spec/). -It is meant for discussion, prototype specification and implementation of a proposal to add support for basic reference types to WebAssembly. - -* See the [overview](proposals/reference-types/Overview.md) for a summary of the proposal. - -* See the [modified spec](https://webassembly.github.io/reference-types/core/) for details. - -The repository is now based on the [bulk operations proposal](proposals/bulk-memory-operations/Overview.md) and includes all respective changes. - -Original README from upstream repository follows... ->>>>>>> reftype/master # spec