Skip to content

Commit

Permalink
Merging conflicts.
Browse files Browse the repository at this point in the history
  • Loading branch information
Otávio Fernandes committed Apr 1, 2019
2 parents 2f8a571 + c98e7e3 commit cea0879
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<a alt="Code Coverage" href="https://codecov.io/gh/otaviof/vault-handler">
<img alt="Code Coverage" src="https://codecov.io/gh/otaviof/vault-handler/branch/master/graph/badge.svg">
</a>
<a href="https://godoc.org/github.com/otaviof/shorty/pkg/shorty">
<img alt="GoDoc Reference" src="https://godoc.org/github.com/otaviof/shorty/pkg/shorty?status.svg">
<a href="https://godoc.org/github.com/otaviof/vault-handler/pkg/vault-handler">
<img alt="GoDoc Reference" src="https://godoc.org/github.com/otaviof/vault-handler/pkg/vault-handler?status.svg">
</a>
<a alt="CI Status" href="https://travis-ci.com/otaviof/vault-handler">
<img alt="CI Status" src="https://travis-ci.com/otaviof/vault-handler.svg?branch=master">
Expand Down

0 comments on commit cea0879

Please sign in to comment.