resolve conflicts

This commit is contained in:
chhylp123
2021-07-27 20:11:22 -04:00
parent 0c81c341d5
commit 6ea66e1290
4 changed files with 4 additions and 22 deletions
+1 -1
View File
@@ -4,7 +4,7 @@
#include <pthread.h>
#include <stdint.h>
#define HA_VERSION "0.15.5-r351"
#define HA_VERSION "0.15.5-r352"
#define VERBOSE 0