resolve conflict

aky15

2023-04-12 dccbcc48a583eb38b4bc5b459d417087826846ac

 funasr/runtime/triton_gpu/model_repo_paraformer_large_offline/encoder/config.pbtxt

@@ -40,7 +40,7 @@
  },
  {
    name: "token_num"
    data_type: TYPE_INT64
    data_type: TYPE_INT32
    dims: [1]
    reshape: { shape: [ ] }
  }