Modify infer seg demo

examples/vision/segmentation/paddleseg/README.md

@@ -2,7 +2,7 @@
 
 ## 模型版本说明
 
-- [PaddleSeg Release/2.6](https://github.com/PaddlePaddle/PaddleSeg/tree/release/2.6)
+- [PaddleSeg develop](https://github.com/PaddlePaddle/PaddleSeg/tree/develop)
 
 目前FastDeploy支持如下模型的部署 
 

examples/vision/segmentation/paddleseg/cpp/infer.cc

@@ -83,8 +83,11 @@ void TrtInfer(const std::string& model_dir, const std::string& image_file) {
   auto option = fastdeploy::RuntimeOption();
   option.UseGpu();
   option.UseTrtBackend();
+<<<<<<< HEAD
 //  option.SetTrtInputShape("x", {1, 3, 256, 256}, {1, 3, 1024, 1024},
 //                          {1, 3, 2048, 2048});
+=======
+>>>>>>> 4de832bc37b1f9c44e4956db94c2605cd34e021b
   auto model = fastdeploy::vision::segmentation::PaddleSegModel(
       model_file, params_file, config_file, option);