Merge branch 'master' of git://github.com/JuliaLang/Example.jl

Conflicts: .travis.yml README.md
JuliaLang · Feb 26, 2015 · 526e34f · Keno · Feb 26, 2015 · jiahao
2 parents b199079 + c2fb909
commit 526e34f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,3 +11,4 @@ script:
     - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
     - julia -e 'Pkg.clone(pwd()); Pkg.build("Example"); Pkg.test("Example"; coverage=true)';
     - julia -e 'cd(Pkg.dir("Example")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())';
+
diff --git a/README.md b/README.md
@@ -3,5 +3,6 @@ Example Julia package repo.
 [![Example](http://pkg.julialang.org/badges/Example_release.svg)](http://pkg.julialang.org/?pkg=Example&ver=release)
 [![Example](http://pkg.julialang.org/badges/Example_nightly.svg)](http://pkg.julialang.org/?pkg=Example&ver=nightly)
 [![Build Status](https://travis-ci.org/JuliaLang/Example.jl.svg?branch=master)](https://travis-ci.org/JuliaLang/Example.jl)
+<<<<<<< HEAD
 [![Coverage Status](https://coveralls.io/repos/JuliaLang/Example.jl/badge.svg?branch=master)](https://coveralls.io/r/JuliaLang/Example.jl?branch=master)