update travis badge - point it to right branch

IsmailM · Feb 15, 2015 · d8a5e56 · d8a5e56
1 parent 2b477ef
commit d8a5e56
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,9 @@
 # GeneValidatorApp
+<<<<<<< HEAD
 [![Build Status](https://travis-ci.org/IsmailM/GeneValidatorApp.svg?branch=alpha)](https://travis-ci.org/IsmailM/GeneValidatorApp)
+=======
+[![Build Status](https://travis-ci.org/IsmailM/GeneValidatorApp.svg?branch=master)](https://travis-ci.org/IsmailM/GeneValidatorApp)
+>>>>>>> update travis badge - point it to right branch
 [![Gem Version](https://badge.fury.io/rb/GeneValidatorApp.svg)](http://badge.fury.io/rb/GeneValidatorApp)
 [![Dependency Status](https://gemnasium.com/IsmailM/GeneValidatorApp.svg)](https://gemnasium.com/IsmailM/GeneValidatorApp)
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/IsmailM/GeneValidatorApp/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/IsmailM/GeneValidatorApp/?branch=master)