resolve conflict in README!
commit73cff94ecdb2d2610cbd001232ab4f2fdbc9cc70
authorEvan Czaplicki <info@elm-lang.org>
dateFri 17 Jan 2014, 18:25 (13 years ago)
parent6a382829d6f537
.travis.ymlnew file+3
@@ -0,0 +1,3 @@
1+language: haskell
2+ghc:
3+ - 7.6
README.md+2−1
@@ -1,6 +1,5 @@
11Learn about the Elm programming language at [elm-lang.org](http://elm-lang.org/).
22
3−
43## Install
54
65**Arch Linux** — follow [these directions](https://github.com/evancz/Elm/wiki/Installing-Elm#arch-linux) and then
@@ -57,3 +56,5 @@ If you are stuck, email
5756[the list](https://groups.google.com/forum/?fromgroups#!forum/elm-discuss)
5857or ask a question in the
5958[#Elm IRC channel](http://webchat.freenode.net/?channels=elm).
59+
60+[](https://travis-ci.org/evancz/Elm)