From 43fd7a1b6e4254acee6527de86d42f3b0cdffb02 Mon Sep 17 00:00:00 2001
From: ksherlock <ksherlock@gmail.com>
Date: Tue, 10 Dec 2019 13:43:49 -0500
Subject: [PATCH] Update .travis.yml

---
 .travis.yml | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4a1fd74..6948c11 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,12 @@
 dist: bionic
-language: generic
-os: osx
-matrix:
-  include:
-    - os: linux
-      env: COMPILER_NAME=gcc CXX=g++ CC=gcc
-    - os: linux
-      env: COMPILER_NAME=clang CXX=clang++ CC=clang
-
-script: make merlin-link
-
+language: cpp
+os:
+  - osx
+  - linux
 compiler:
   - clang
   - gcc
+ 
+ script: make all
+