From 7aa398aede6fe7c2419359a78290b6a6835a82bd Mon Sep 17 00:00:00 2001
From: Sally Coolatta <tehrealsalt@gmail.com>
Date: Sun, 9 Aug 2020 20:48:55 -0400
Subject: [PATCH] Merge .travis.yml

---
 .travis.yml | 51 ---------------------------------------------------
 1 file changed, 51 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e82d8e1ca..e3f5950ac 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,11 +25,8 @@ matrix:
               - libpng-dev
               - libgl1-mesa-dev
               - libgme-dev
-<<<<<<< HEAD
               - libcurl4-openssl-dev
-=======
               - libopenmpt-dev
->>>>>>> srb2/next
               - p7zip-full
               - gcc-4.4
           compiler: gcc-4.4
@@ -46,11 +43,8 @@ matrix:
               - libpng-dev
               - libgl1-mesa-dev
               - libgme-dev
-<<<<<<< HEAD
               - libcurl4-openssl-dev
-=======
               - libopenmpt-dev
->>>>>>> srb2/next
               - p7zip-full
               - gcc-4.6
           compiler: gcc-4.6
@@ -67,11 +61,8 @@ matrix:
               - libpng-dev
               - libgl1-mesa-dev
               - libgme-dev
-<<<<<<< HEAD
               - libcurl4-openssl-dev
-=======
               - libopenmpt-dev
->>>>>>> srb2/next
               - p7zip-full
               - gcc-4.7
           compiler: gcc-4.7
@@ -94,11 +85,8 @@ matrix:
               - libpng-dev
               - libgl1-mesa-dev
               - libgme-dev
-<<<<<<< HEAD
               - libcurl4-openssl-dev
-=======
               - libopenmpt-dev
->>>>>>> srb2/next
               - p7zip-full
               - gcc-4.8
           compiler: gcc-4.8
@@ -116,11 +104,8 @@ matrix:
               - libpng-dev
               - libgl1-mesa-dev
               - libgme-dev
-<<<<<<< HEAD
               - libcurl4-openssl-dev
-=======
               - libopenmpt-dev
->>>>>>> srb2/next
               - p7zip-full
               - gcc-7
           compiler: gcc-7
@@ -138,11 +123,8 @@ matrix:
               - libpng-dev
               - libgl1-mesa-dev
               - libgme-dev
-<<<<<<< HEAD
               - libcurl4-openssl-dev
-=======
               - libopenmpt-dev
->>>>>>> srb2/next
               - p7zip-full
               - gcc-8
           compiler: gcc-8
@@ -164,11 +146,8 @@ matrix:
               - libpng-dev
               - libgl1-mesa-dev
               - libgme-dev
-<<<<<<< HEAD
               - libcurl4-openssl-dev
-=======
               - libopenmpt-dev
->>>>>>> srb2/next
               - p7zip-full
               - clang-3.5
           compiler: clang-3.5
@@ -186,11 +165,8 @@ matrix:
               - libpng-dev
               - libgl1-mesa-dev
               - libgme-dev
-<<<<<<< HEAD
               - libcurl4-openssl-dev
-=======
               - libopenmpt-dev
->>>>>>> srb2/next
               - p7zip-full
               - clang-3.6
           compiler: clang-3.6
@@ -208,11 +184,8 @@ matrix:
               - libpng-dev
               - libgl1-mesa-dev
               - libgme-dev
-<<<<<<< HEAD
               - libcurl4-openssl-dev
-=======
               - libopenmpt-dev
->>>>>>> srb2/next
               - p7zip-full
               - clang-3.7
           compiler: clang-3.7
@@ -230,11 +203,8 @@ matrix:
               - libpng-dev
               - libgl1-mesa-dev
               - libgme-dev
-<<<<<<< HEAD
               - libcurl4-openssl-dev
-=======
               - libopenmpt-dev
->>>>>>> srb2/next
               - p7zip-full
               - clang-3.8
           compiler: clang-3.8
@@ -252,11 +222,8 @@ matrix:
               - libpng-dev
               - libgl1-mesa-dev
               - libgme-dev
-<<<<<<< HEAD
               - libcurl4-openssl-dev
-=======
               - libopenmpt-dev
->>>>>>> srb2/next
               - p7zip-full
               - clang-3.9
           compiler: clang-3.9
@@ -512,11 +479,8 @@ matrix:
               - libpng-dev
               - libgl1-mesa-dev
               - libgme-dev
-<<<<<<< HEAD
               - libcurl4-openssl-dev
-=======
               - libopenmpt-dev
->>>>>>> srb2/next
               - p7zip-full
               - gcc-4.8
           compiler: gcc-4.8
@@ -543,11 +507,8 @@ matrix:
               - libpng-dev
               - libgl1-mesa-dev
               - libgme-dev
-<<<<<<< HEAD
               - libcurl4-openssl-dev
-=======
               - libopenmpt-dev
->>>>>>> srb2/next
               - p7zip-full
               - gcc-4.8
           compiler: gcc-4.8
@@ -574,11 +535,8 @@ matrix:
               - libpng-dev
               - libgl1-mesa-dev
               - libgme-dev
-<<<<<<< HEAD
               - libcurl4-openssl-dev
-=======
               - libopenmpt-dev
->>>>>>> srb2/next
               - p7zip-full
               - gcc-4.8
           compiler: gcc-4.8
@@ -605,11 +563,8 @@ matrix:
               - libpng-dev
               - libgl1-mesa-dev
               - libgme-dev
-<<<<<<< HEAD
               - libcurl4-openssl-dev
-=======
               - libopenmpt-dev
->>>>>>> srb2/next
               - p7zip-full
               - gcc-4.8
           compiler: gcc-4.8
@@ -636,11 +591,8 @@ matrix:
               - libpng-dev
               - libgl1-mesa-dev
               - libgme-dev
-<<<<<<< HEAD
               - libcurl4-openssl-dev
-=======
               - libopenmpt-dev
->>>>>>> srb2/next
               - p7zip-full
               - gcc-4.8
           compiler: gcc-4.8
@@ -683,11 +635,8 @@ addons:
     - libgl1-mesa-dev
     - libgme-dev
     - zlib1g-dev
-<<<<<<< HEAD
     - libcurl4-openssl-dev
-=======
     - libopenmpt-dev
->>>>>>> srb2/next
     - p7zip-full
   homebrew:
     taps: