From c1683c74d2b2f9c9a7412fccd6c9ba50043dff00 Mon Sep 17 00:00:00 2001
From: Rod Treweek <rodtreweek@users.noreply.github.com>
Date: Mon, 5 Jun 2017 13:32:24 -0700
Subject: [PATCH] Update README.md

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index b3fa2728..b15c9fbf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 sudo: false
 script: test/run
 language: c
+<<<<<<< HEAD
 os:
   - linux
   - osx