resolve conflict

This commit is contained in:
chhylp123
2020-07-13 22:44:40 -04:00
3 changed files with 66 additions and 71 deletions
+1 -1
View File
@@ -3,7 +3,7 @@
#include <pthread.h>
#define HA_VERSION "0.8-dirty-r280"
#define HA_VERSION "0.8-r279"
#define VERBOSE 0