From e12e51de1667357f0d045d6f2a4257ebd62a1e1f Mon Sep 17 00:00:00 2001
From: Galileo Sartor <galileo.sartor@gmail.com>
Date: Sun, 20 Jan 2019 19:36:40 +0100
Subject: [PATCH] remove older ppa

---
 .travis.yml         | 1 -
 scribus/scpaths.cpp | 7 -------
 2 files changed, 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3346d58b93..462a6a38c1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,7 +24,6 @@ before_install:
 # Linux
 -   if [ $TRAVIS_OS_NAME == linux ]; then
       sudo apt-add-repository ppa:beineri/opt-qt595-xenial -y;
-      sudo apt-add-repository ppa:as-bahanta/raqm -y;
       sudo apt-add-repository ppa:ricotz/testing -y;
       sudo apt-get update -qq;
     fi
diff --git a/scribus/scpaths.cpp b/scribus/scpaths.cpp
index 96153f3384..dc62f1475b 100644
--- a/scribus/scpaths.cpp
+++ b/scribus/scpaths.cpp
@@ -453,17 +453,10 @@ QStringList ScPaths::systemProfilesDirs()
 	winSysDir = winSysDir.replace('\\','/');
 	if (osVersion.dwPlatformId == VER_PLATFORM_WIN32_NT) // Windows NT/2k/XP
 	{
-<<<<<<< HEAD
 		if (osVersion.dwMajorVersion >= 5) // for 2k and XP dwMajorVersion == 5 
 			iccProfDirs.append(winSysDir + "/Spool/Drivers/Color/");
 	}
 	else if (osVersion.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) // Windows 9x/Me 
-=======
-		if( osVersion.dwMajorVersion >= 5 ) // for 2k and XP dwMajorVersion == 5
-			iccProfDirs.append( winSysDir + "/Spool/Drivers/Color/");
-	}
-	else if( osVersion.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS ) // Windows 9x/Me
->>>>>>> Add explicit appname on linux.
 	{
 		if (osVersion.dwMajorVersion >= 4 && osVersion.dwMinorVersion >= 10) // Win98 or WinMe
 			iccProfDirs.append(winSysDir + "/Color/");