Release pegasus 1.11.5-RC1

fa02a3be · neverchanje · c954e93d · fa02a3be
隐藏空白更改
内联并排

Showing with 4 addition and 0 deletion

src/include/pegasus/version.h src/include/pegasus/version.h +4 -0

未找到文件。
--- a/src/include/pegasus/version.h
+++ b/src/include/pegasus/version.h
@@ -6,6 +6,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #define PEGASUS_VERSION "1.12.SNAPSHOT"
 =======
 #define PEGASUS_VERSION "1.11.4"
@@ -16,3 +17,6 @@
 =======
 #define PEGASUS_VERSION "1.11.4"
 >>>>>>> 6b566c4... Release pegasus 1.11.4
+=======
+#define PEGASUS_VERSION "1.11.5-RC1"
+>>>>>>> 21ed6bb... Release pegasus 1.11.5-RC1