Resolved merge conflict

This commit is contained in:
Samuel Hawksby-Robinson 2020-06-24 11:28:15 +01:00
commit 3d56cdb50a
No known key found for this signature in database
GPG Key ID: 64CF99D4A64A1205
3 changed files with 1 additions and 29 deletions

View File

@ -1,7 +1,7 @@
---
title: Dapp browser API usage
version: 0.1.0
permalink: /spec/10
permalink: /spec/14
parent: Draft specs
status: Draft
authors:

View File

@ -1,14 +0,0 @@
---
nav_exclude: true
parent: Raw specs
---
# Status Browser Specification
> Version: 0.1
>
> Status: Draft
>
> Authors: Corey Petty [corey@status.im](mailto:corey@status.im) (alphabetical order)
TODO

View File

@ -1,14 +0,0 @@
---
nav_exclude: true
parent: Raw specs
---
# Status Storage Specification
> Version: 0.1
>
> Status: Draft
>
> Authors: Corey Petty [corey@status.im](mailto:corey@status.im) (alphabetical order)
TODO