Fix tests on travis. Merl is configured by rebar.config.script.

.travis.yml

@@ -18,10 +18,8 @@ otp_release:
 #   - R15B01 failing with timeout
 #   - R15B failing with timeout
 
-# since Travis is naughty and calls rebar get-deps behind our backs,
-# we'll have to clean it up and build merl our selves.. (pre OTP 18.0)
 script: 
-  - "[ ! -d deps/merl ] || make -C deps/merl && make check"
+  - "make check"
 
 notifications:
   irc: "chat.freenode.net#erlydtl"

rebar-slex.config

@@ -1,9 +1,7 @@
 %% -*- mode: erlang -*-
 
 {deps,
- [ %% uncomment merl dep in not building on OTP 18.0 or later..
-   %% {merl, ".*", {git, "git://github.com/erlydtl/merl.git", {branch, "erlydtl"}}, [raw]},
-   {slex, ".*", {git, "git://github.com/erlydtl/slex.git", {branch, "master"}}}
+ [{slex, ".*", {git, "git://github.com/erlydtl/slex.git", {branch, "master"}}}
  ]
 }.