Resolve conflicts in GITALY_SERVER_VERSION

dfdb892b · Stan Hu · 47dd2063 · dfdb892b
Commit dfdb892b authored Aug 07, 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.116.0
-=======
 0.117.0
->>>>>>> upstream/master