From 14be935a4f8231233487d510c8db0b544bcf0f69 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期一, 25 一月 2021 17:40:29 +0800
Subject: [PATCH] fix conflict

---
 src/bus_error.h |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/bus_error.h b/src/bus_error.h
index 709f973..5f6128b 100644
--- a/src/bus_error.h
+++ b/src/bus_error.h
@@ -4,11 +4,11 @@
 
 
 
-#define EBUS_BASE 10000
-#define EBUS_TIMEOUT 10001
-#define EBUS_CLOSED 10002
-#define EBUS_KEY_INUSED 10003
-#define EBUS_NET 10004
+#define EBUS_BASE 500
+#define EBUS_TIMEOUT 501
+#define EBUS_CLOSED 502
+#define EBUS_KEY_INUSED 503
+#define EBUS_NET 504
 
 extern int bus_errno;
 

--
Gitblit v1.8.0