Resolve conflict in GITALY_SERVER_VERSION

531bad77 · Stan Hu · 55bcda06 · 531bad77
Commit 531bad77 authored Jun 27, 2018 by Stan Hu
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
-0.108.0
-=======
 0.109.0
->>>>>>> upstream/master