Skip to content

Commit d684945

Browse files
committed
Merged with lite
2 parents 427eb80 + c9645bc commit d684945

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
<div align="center">
22

3+
<<<<<<< HEAD
34
<p align="center"><a href="https://distributedobjectprotocol.org"><img src="https://distributedobjectprotocol.org/img/logo.svg" width="200"></a></p>
5+
=======
6+
<p align="center"><a href="https://distributedobjectprotocol.org"><img width="200" src="https://distributedobjectprotocol.org/img/logo.svg"></a></p>
7+
>>>>>>> c9645bcc9606371ea0c2ddc3831cd776ceedbf82
48
59
[![npm](https://img.shields.io/npm/v/dop?style=flat-square)](https://www.npmjs.com/package/dop)
610
[![npm bundle size](https://img.shields.io/bundlephobia/minzip/dop?style=flat-square)](https://bundlephobia.com/result?p=dop)

0 commit comments

Comments
 (0)