resolve conflict in README!

Zokka-Dev · Jan 17, 2014 · 73cff94 · 73cff94
2 parents 6a38282 + 9d6f537
commit 73cff94
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,3 @@
+language: haskell
+ghc:
+  - 7.6
diff --git a/README.md b/README.md
@@ -1,6 +1,5 @@
 Learn about the Elm programming language at [elm-lang.org](http://elm-lang.org/).
 
-
 ## Install
 
 **Arch Linux** &mdash; follow [these directions](https://github.com/evancz/Elm/wiki/Installing-Elm#arch-linux) and then
@@ -57,3 +56,5 @@ If you are stuck, email
 [the list](https://groups.google.com/forum/?fromgroups#!forum/elm-discuss)
 or ask a question in the
 [#Elm IRC channel](http://webchat.freenode.net/?channels=elm). 
+
+[![Build Status](https://travis-ci.org/evancz/Elm.png)](https://travis-ci.org/evancz/Elm)