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

---
 test_net_socket/test_bus_stop.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/test_net_socket/test_bus_stop.cpp b/test_net_socket/test_bus_stop.cpp
index a1c20ec..3185029 100644
--- a/test_net_socket/test_bus_stop.cpp
+++ b/test_net_socket/test_bus_stop.cpp
@@ -2,7 +2,7 @@
 #include "net_mod_socket_wrapper.h"
 #include "bus_server_socket_wrapper.h"
 
-#include "shm_mm_wraper.h"
+#include "shm_mm_wrapper.h"
 #include "usg_common.h"
 #include <getopt.h>
 

--
Gitblit v1.8.0