Skip to content

Commit f3a37dd

Browse files
remove travis, adds circleci badge
1 parent 2421b95 commit f3a37dd

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
A git merge driver that use [xdiff](https://github.com/dominictarr/xdiff) to automatically resolve merge conflicts in json files. It also detects indentation automatically. This project was inspired by [git-po-merge](https://github.com/beck/git-po-merge).
44

5-
[![Build Status](https://travis-ci.org/jonatanpedersen/git-json-merge.svg?branch=master)](https://travis-ci.org/jonatanpedersen/git-json-merge)
5+
[![@git-json-merge](https://circleci.com/gh/jonatanpedersen/git-json-merge.svg?style=shield)](https://app.circleci.com/pipelines/github/jonatanpedersen/git-json-merge)
66
[![NPM Version](https://img.shields.io/npm/v/git-json-merge.svg)](https://www.npmjs.com/package/git-json-merge)
77

88
## Install

0 commit comments

Comments
 (0)