From d18cd4ad0824288d0c3eb622f4270f0a4f521715 Mon Sep 17 00:00:00 2001 From: Nick Thomas Date: Tue, 5 Feb 2019 14:34:35 +0000 Subject: [PATCH] Fix a conflict in GITALY_SERVER_VERSION GitLab.com master now points at Gitaly v1.17.0. Dev master pointed at 1.14.1 due to a recent security release. That fix is present in 1.17.0 so it is safe to take the .com side here. --- GITALY_SERVER_VERSION | 4 ---- 1 file changed, 4 deletions(-) diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index a020d806b29..092afa15df4 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD 1.17.0 -======= -1.14.1 ->>>>>>> dev/master