From c607e8c35d7c8f697acbf58c3316cfbb6f0a409c Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 30 Mar 2014 01:43:11 +0100
Subject: [PATCH] [ticket/12318] Always install new config file on HHVM upgrade
 conflict.

PHPBB3-12318
---
 travis/setup-webserver.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/travis/setup-webserver.sh b/travis/setup-webserver.sh
index 68134872f9..5bc0feae88 100755
--- a/travis/setup-webserver.sh
+++ b/travis/setup-webserver.sh
@@ -26,7 +26,7 @@ APP_SOCK=$(realpath "$DIR")/php-app.sock
 if [ "$TRAVIS_PHP_VERSION" = 'hhvm' ]
 then
 	# Upgrade to a recent stable version of HHVM
-	sudo apt-get install -y hhvm
+	sudo apt-get -o Dpkg::Options::="--force-confnew" install -y hhvm
 
 	HHVM_LOG=$(realpath "$DIR")/hhvm.log