Resolve merge conflicts

ayeshLK · Sep 14, 2023 · 45a3f82 · 45a3f82
1 parent 2520004
commit 45a3f82
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/ballerina/annotation.bal b/ballerina/annotation.bal
@@ -25,8 +25,8 @@
 # + unsubscribeOnShutdown - This flag notifies whether or not to initiate unsubscription when the service is shutting down
 # + httpConfig - The configuration for the subscriber client used to interact with the discovered/specified hub
 # + discoveryConfig - HTTP client configurations for resource discovery
-# + customParams - Additional parameters which need to be sent with the subscription request
-# + customHeaders - Additional HTTP headers which need to be sent with the subscription request
+# + customParams - Additional parameters, which need to be sent with the subscription request
+# + customHeaders - Additional HTTP headers, which need to be sent with the subscription request
 # + servicePath - The generated service-path if the service-path is not provided. This is auto-generated at the compile-time.
 public type SubscriberServiceConfiguration record {|
  string|[string, string] target?;

diff --git a/docs/spec/spec.md b/docs/spec/spec.md
@@ -3,7 +3,7 @@
 _Owners_: @shafreenAnfar @chamil321 @ayeshLK 
 _Reviewers_: @chamil321 
 _Created_: 2022/01/31 
-_Updated_: 2022/05/23 
+_Updated_: 2023/09/14 
 _Edition_: Swan Lake 
 
 ## Introduction 
@@ -280,8 +280,8 @@ should be `websub:SubscriberServiceConfig` a service-level-annotation for `websu
 # + unsubscribeOnShutdown - This flag notifies whether or not to initiate unsubscription when the service is shutting down
 # + httpConfig - The configuration for the subscriber client used to interact with the discovered/specified hub
 # + discoveryConfig - HTTP client configurations for resource discovery
-# + customParams - Additional parameters which need to be sent with the subscription request
-# + customHeaders - Additional HTTP headers which need to be sent with the subscription request
+# + customParams - Additional parameters, which need to be sent with the subscription request
+# + customHeaders - Additional HTTP headers, which need to be sent with the subscription request
 # + servicePath - The generated service-path if the service-path is not provided. This is auto-generated at the compile-time
 public type SubscriberServiceConfiguration record {|
  string|[string, string] target?;