Skip to content

Commit

Permalink
Fix merge artefact
Browse files Browse the repository at this point in the history
  • Loading branch information
rossberg authored Jun 28, 2021
1 parent c30b3d6 commit 6876ee8
Showing 1 changed file with 0 additions and 17 deletions.
17 changes: 0 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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

Expand Down

0 comments on commit 6876ee8

Please sign in to comment.