diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-02-05 14:34:35 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-02-05 14:34:35 +0000 |
| commit | d18cd4ad0824288d0c3eb622f4270f0a4f521715 (patch) | |
| tree | aef873499506be6408e7b503a9bcc007281a55b2 | |
| parent | 32af0108cfa88db4b92fd9e3286a35032e488bb0 (diff) | |
| download | gitlab-ce-d18cd4ad0824288d0c3eb622f4270f0a4f521715.tar.gz | |
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.
| -rw-r--r-- | GITALY_SERVER_VERSION | 4 |
1 files changed, 0 insertions, 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 |