a

Author: brunobritodev

README.md

@@ -1,11 +1,7 @@
 ![image](https://github.com/brunohbrito/JP-Project/blob/master/docs/images/logo.png?raw=true)
 
 [![Build status](https://ci.appveyor.com/api/projects/status/08v6mg6q439x16xt?svg=true)](https://ci.appveyor.com/project/brunohbrito/jp-project)
-<<<<<<< HEAD
 [![Build Status](https://dev.azure.com/brunohbrito/JpProject/_apis/build/status/brunohbrito.JPProject.IdentityServer4.AdminUI?branchName=master)](https://dev.azure.com/brunohbrito/JpProject/_build/latest?definitionId=2&branchName=master)
-=======
-[![Build Status](https://dev.azure.com/brunohbrito/Jp-Project/_apis/build/status/brunohbrito.JP-Project)](https://dev.azure.com/brunohbrito/Jp-Project/_build/latest?definitionId=1)
->>>>>>> remotes/origin/master
 [![License](https://img.shields.io/github/license/brunohbrito/jp-project.svg)](LICENSE)
 ![DOCS](https://readthedocs.org/projects/jp-project/badge/?version=latest&style=flat)