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_walk3.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/test/test_right_walk3.c b/test/test_right_walk3.c
index 31ca7ff..9b97b1c 100644
--- a/test/test_right_walk3.c
+++ b/test/test_right_walk3.c
@@ -94,7 +94,7 @@
void test3() {
- std::ifstream fin("test2.txt");
+ std::ifstream fin("test3.txt");
char line[1024];
//std::string line;
char *targetIdStr;
--
Gitblit v1.8.0