From e7e07f42b336bb7b5c488eb3bcc6397c0a2a03f4 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期一, 24 八月 2020 16:36:09 +0800
Subject: [PATCH] fix conflict

---
 test/test_right_walk |    0 
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/test/test_right_walk b/test/test_right_walk
index 95f4046..6ce46f0 100755
--- a/test/test_right_walk
+++ b/test/test_right_walk
Binary files differ

--
Gitblit v1.8.0