From 9afadccefa422cd2c114271d6edb793981d3687d Mon Sep 17 00:00:00 2001
From: Sally Coolatta <tehrealsalt@gmail.com>
Date: Sun, 9 Aug 2020 21:32:55 -0400
Subject: [PATCH] Fix duplicates being added to .travis.yml &
debain-template/control
---
.travis.yml | 17 -----------------
appveyor.yml | 4 ----
debian-template/control | 1 -
3 files changed, 22 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index f934e9eeaf..789426be7f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,7 +25,6 @@ matrix:
- libpng-dev
- libgl1-mesa-dev
- libgme-dev
- - libcurl4-openssl-dev
- libopenmpt-dev
- libcurl4-openssl-dev
- p7zip-full
@@ -44,7 +43,6 @@ matrix:
- libpng-dev
- libgl1-mesa-dev
- libgme-dev
- - libcurl4-openssl-dev
- libopenmpt-dev
- libcurl4-openssl-dev
- p7zip-full
@@ -63,7 +61,6 @@ matrix:
- libpng-dev
- libgl1-mesa-dev
- libgme-dev
- - libcurl4-openssl-dev
- libopenmpt-dev
- libcurl4-openssl-dev
- p7zip-full
@@ -88,7 +85,6 @@ matrix:
- libpng-dev
- libgl1-mesa-dev
- libgme-dev
- - libcurl4-openssl-dev
- libopenmpt-dev
- libcurl4-openssl-dev
- p7zip-full
@@ -108,7 +104,6 @@ matrix:
- libpng-dev
- libgl1-mesa-dev
- libgme-dev
- - libcurl4-openssl-dev
- libopenmpt-dev
- libcurl4-openssl-dev
- p7zip-full
@@ -128,7 +123,6 @@ matrix:
- libpng-dev
- libgl1-mesa-dev
- libgme-dev
- - libcurl4-openssl-dev
- libopenmpt-dev
- libcurl4-openssl-dev
- p7zip-full
@@ -152,7 +146,6 @@ matrix:
- libpng-dev
- libgl1-mesa-dev
- libgme-dev
- - libcurl4-openssl-dev
- libopenmpt-dev
- libcurl4-openssl-dev
- p7zip-full
@@ -172,7 +165,6 @@ matrix:
- libpng-dev
- libgl1-mesa-dev
- libgme-dev
- - libcurl4-openssl-dev
- libopenmpt-dev
- libcurl4-openssl-dev
- p7zip-full
@@ -192,7 +184,6 @@ matrix:
- libpng-dev
- libgl1-mesa-dev
- libgme-dev
- - libcurl4-openssl-dev
- libopenmpt-dev
- libcurl4-openssl-dev
- p7zip-full
@@ -212,7 +203,6 @@ matrix:
- libpng-dev
- libgl1-mesa-dev
- libgme-dev
- - libcurl4-openssl-dev
- libopenmpt-dev
- libcurl4-openssl-dev
- p7zip-full
@@ -232,7 +222,6 @@ matrix:
- libpng-dev
- libgl1-mesa-dev
- libgme-dev
- - libcurl4-openssl-dev
- libopenmpt-dev
- libcurl4-openssl-dev
- p7zip-full
@@ -490,7 +479,6 @@ matrix:
- libpng-dev
- libgl1-mesa-dev
- libgme-dev
- - libcurl4-openssl-dev
- libopenmpt-dev
- libcurl4-openssl-dev
- p7zip-full
@@ -519,7 +507,6 @@ matrix:
- libpng-dev
- libgl1-mesa-dev
- libgme-dev
- - libcurl4-openssl-dev
- libopenmpt-dev
- libcurl4-openssl-dev
- p7zip-full
@@ -548,7 +535,6 @@ matrix:
- libpng-dev
- libgl1-mesa-dev
- libgme-dev
- - libcurl4-openssl-dev
- libopenmpt-dev
- libcurl4-openssl-dev
- p7zip-full
@@ -577,7 +563,6 @@ matrix:
- libpng-dev
- libgl1-mesa-dev
- libgme-dev
- - libcurl4-openssl-dev
- libopenmpt-dev
- libcurl4-openssl-dev
- p7zip-full
@@ -606,7 +591,6 @@ matrix:
- libpng-dev
- libgl1-mesa-dev
- libgme-dev
- - libcurl4-openssl-dev
- libopenmpt-dev
- libcurl4-openssl-dev
- p7zip-full
@@ -651,7 +635,6 @@ addons:
- libgl1-mesa-dev
- libgme-dev
- zlib1g-dev
- - libcurl4-openssl-dev
- libopenmpt-dev
- libcurl4-openssl-dev
- p7zip-full
diff --git a/appveyor.yml b/appveyor.yml
index ffba72c785..aa7a4c7cd2 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
version: 2.0.{branch}-{build}
-=======
-version: 2.2.6.{branch}-{build}
->>>>>>> srb2/next
os: MinGW
environment:
diff --git a/debian-template/control b/debian-template/control
index f90c599160..532d78abea 100644
--- a/debian-template/control
+++ b/debian-template/control
@@ -12,7 +12,6 @@ Build-Depends: debhelper (>= 7.0.50~),
libgme-dev,
libcurl4-openssl-dev,
libopenmpt-dev,
- libcurl4-openssl-dev,
libglu1-dev | libglu-dev,
libosmesa6-dev | libgl-dev,
nasm [i386]
--
GitLab