This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git
commit ceec64bb7115d4061a0e99b82bc96b8404fd7196 Author: Lei Zhang <[email protected]> AuthorDate: Sun Jul 28 19:38:07 2019 +0800 SCB-1369 Fixed conflict --- docs/user_guide.md | 9 +++------ docs/user_guide_zh.md | 4 +--- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/docs/user_guide.md b/docs/user_guide.md index 44eb353..60446d7 100644 --- a/docs/user_guide.md +++ b/docs/user_guide.md @@ -786,13 +786,10 @@ Alpha instance can register to the discovery service, Omega obtains Alpha's inst Alpha can be highly available by deploying multiple instances, enable cluster support with the `alpha.cluster.master.enabled=true` parameter. -<<<<<<< HEAD - - [src-TransactionClientHttpRequestInterceptor]: ../omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/pack/omega/transport/resttemplate/TransactionClientHttpRequestInterceptor.java [src-TransactionHandlerInterceptor]: ../omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/pack/omega/transport/resttemplate/TransactionHandlerInterceptor.java -======= + + ## Experiment -[Alpha State Machine Mode](fsm/how_to_use_fsm_zh.md) ->>>>>>> 2af60216... SCB-1369 Update FSM documents +[Alpha State Machine Mode](fsm/how_to_use_fsm_zh.md) \ No newline at end of file diff --git a/docs/user_guide_zh.md b/docs/user_guide_zh.md index 88bd429..4c5e5d1 100644 --- a/docs/user_guide_zh.md +++ b/docs/user_guide_zh.md @@ -773,11 +773,9 @@ public void bar(BarCommandWithTxContext cmdWithTxContext) { Alpha 可以通过部署多实例的方式保证高可用，使用 `alpha.cluster.master.enabled=true` 参数开启集群支持 -<<<<<<< HEAD [src-TransactionClientHttpRequestInterceptor]: ../omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/pack/omega/transport/resttemplate/TransactionClientHttpRequestInterceptor.java [src-TransactionHandlerInterceptor]: ../omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/pack/omega/transport/resttemplate/TransactionHandlerInterceptor.java -======= + ## 实验 [Alpha 状态机模式](fsm/how_to_use_fsm_zh.md) ->>>>>>> 2af60216... SCB-1369 Update FSM documents
