diff options
Diffstat (limited to 'GITALY_SERVER_VERSION')
| -rw-r--r-- | GITALY_SERVER_VERSION | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 092afa15df4..a020d806b29 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1,5 @@ +<<<<<<< HEAD 1.17.0 +======= +1.14.1 +>>>>>>> dev/master |