Merge branch 'master' into develop

tresinformal · Sep 22, 2021 · 38dbb22 · 38dbb22
2 parents 35bca27 + 6587e83
commit 38dbb22
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -12,8 +12,6 @@ Branch     |[GitHub Actions](https://github.com/tresinformal/game/actions)
 `sebastian`|![check](https://github.com/tresinformal/game/workflows/check/badge.svg?branch=sebastian)|[![codecov.io](https://codecov.io/github/tresinformal/game/coverage.svg?branch=sebastian)](https://codecov.io/github/tresinformal/game/branch/sebastian)
 `swom`     |![check](https://github.com/tresinformal/game/workflows/check/badge.svg?branch=stefano)  |[![codecov.io](https://codecov.io/github/tresinformal/game/coverage.svg?branch=stefano)](https://codecov.io/github/tresinformal/game/branch/stefano)
 `theo`     |![check](https://github.com/tresinformal/game/workflows/check/badge.svg?branch=theo)     |[![codecov.io](https://codecov.io/github/tresinformal/game/coverage.svg?branch=theo)](https://codecov.io/github/tresinformal/game/branch/theo)
-`xiaoyan`  |![check](https://github.com/tresinformal/game/workflows/check/badge.svg?branch=xiaoyan)  |[![codecov.io](https://codecov.io/github/tresinformal/game/coverage.svg?branch=xiaoyan)](https://codecov.io/github/tresinformal/game/branch/xiaoyan)
-
 
  * Branches are ordered `master`, `develop`, then topic branches alphabetically
 
@@ -157,6 +155,8 @@ A medior developer
 
 You know what to do :+1:
 
+
+
 ## Screenshots
 
 Most recent at the top.
@@ -188,7 +188,3 @@ Most recent at the top.
 
 ![](pics/20190929.png)
 
-<<<<<<< HEAD
-=======
-
->>>>>>> develop