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.

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.
d18cd4ad · Nick Thomas · 32af0108 · d18cd4ad
Commit d18cd4ad authored Feb 05, 2019 by Nick Thomas
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

GITALY_SERVER_VERSION GITALY_SERVER_VERSION +0 -4

No files found.
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
-<<<<<<< HEAD
 1.17.0
-=======
-1.14.1
->>>>>>> dev/master