Skip to content
This repository has been archived by the owner on Jul 18, 2023. It is now read-only.

Commit

Permalink
Resolving merge conflict in README.md
Browse files Browse the repository at this point in the history
  • Loading branch information
Brent Buffenbarger committed Jul 22, 2020
2 parents 50856d4 + bef332f commit 168e06e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ name: Coverage
# events but only for the master branch
on:
push:
branches: [ development ]
branches:
- dev
- development
pull_request:
branches: [ master ]

Expand All @@ -33,4 +35,4 @@ jobs:
uses: shogo82148/[email protected]
with:
path-to-profile: server-coverage.cov
working-directory: server
working-directory: server
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
![Go](https://github.com/jak103/uno/workflows/Go/badge.svg?branch=master)

![Docker Image CI](https://github.com/jak103/uno/workflows/Docker%20Image%20CI/badge.svg)

[![Coverage Status](https://coveralls.io/repos/github/brent-buffenbarger/uno/badge.svg?branch=development)](https://coveralls.io/github/brent-buffenbarger/uno)
[![Coverage Status](https://coveralls.io/repos/github/jak103/uno/badge.svg?branch=dev)](https://coveralls.io/github/jak103/uno)

Read me

Expand Down

0 comments on commit 168e06e

Please sign in to comment.