From b69b5f2fa61da17edff0401ca252111821298276 Mon Sep 17 00:00:00 2001 From: chenxiaoyu05 Date: Mon, 8 Oct 2018 16:29:36 +0800 Subject: [PATCH] remove git-conflict mark --- test/framework/test_load.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/test/framework/test_load.cpp b/test/framework/test_load.cpp index d3d5705e63..64fa42658b 100644 --- a/test/framework/test_load.cpp +++ b/test/framework/test_load.cpp @@ -21,15 +21,9 @@ int main() { paddle_mobile::Loader loader; // ../../../test/models/googlenet // ../../../test/models/mobilenet -<<<<<<< HEAD - auto program = loader.Load(g_mobilenet_ssd, false, false); - // auto program = loader.Load(g_googlenet_combine + "/model", - // g_googlenet_combine + - // "/params", true); -======= + // auto program = loader.Load(g_googlenet, true); // auto program = loader.Load(g_mobilenet_ssd, true); ->>>>>>> e60ab7ae5a43b9cc788813877fbfffc67c87b5f3 auto program = loader.Load(std::string(g_ocr) + "/model", std::string(g_ocr) + "/params", false); -- GitLab