Skip to content

Commit f707010

Browse files
committed
Merge branch 'dev' of github.com:papes1ns/spin.dev into dev
2 parents 46103b7 + 5dac593 commit f707010

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
1+
<<<<<<< HEAD
12
[![license-check](https://github.com/papes1ns/merln/actions/workflows/license-check.yml/badge.svg)](https://github.com/papes1ns/merln/actions/workflows/license-check.yml)
23
[![validate](https://github.com/papes1ns/merln/actions/workflows/validate.yml/badge.svg)](https://github.com/papes1ns/merln/actions/workflows/validate.yml)
4+
=======
5+
[![test](https://github.com/papes1ns/merln/actions/workflows/test.yml/badge.svg)](https://github.com/papes1ns/merln/actions/workflows/test.yml)
6+
[![validate](https://github.com/papes1ns/merln/actions/workflows/validate.yml/badge.svg)](https://github.com/papes1ns/merln/actions/workflows/validate.yml)
7+
[![license-check](https://github.com/papes1ns/merln/actions/workflows/license-check.yml/badge.svg)](https://github.com/papes1ns/merln/actions/workflows/license-check.yml)
8+
>>>>>>> 5dac593e2696c9d101186af75c5e89d00325d163
39
[![deploy](https://github.com/papes1ns/merln/actions/workflows/deploy.yml/badge.svg)](https://github.com/papes1ns/merln/actions/workflows/deploy.yml)
410

511
![merln](packages/web/public/favicon.svg)

0 commit comments

Comments
 (0)