From d796390737f531c39f5a86de45023d0d93b820ff Mon Sep 17 00:00:00 2001
From: Rod Treweek <rod@puppet.com>
Date: Mon, 26 Jun 2017 12:24:51 -0700
Subject: [PATCH] cleaning up

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

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