Merge pull request #1038 from chenxiaoyu3/fix-push-chaos

remove git-conflict mark

test/framework/test_load.cpp

@@ -21,15 +21,9 @@ int main() {
   paddle_mobile::Loader<paddle_mobile::CPU> 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);