# HG changeset patch
# User Vladimir Homutov <vl@nginx.com>
# Date 1468334080 -10800
# Node ID 8ed51b02f655a3fd6fbd68f30ee3f5bf26978845
# Parent  7cbc6bc632283230d98ef0fc7c6ea6b91e7c40b4
Stream: style.

diff --git a/src/stream/ngx_stream_limit_conn_module.c b/src/stream/ngx_stream_limit_conn_module.c
--- a/src/stream/ngx_stream_limit_conn_module.c
+++ b/src/stream/ngx_stream_limit_conn_module.c
@@ -101,7 +101,7 @@ static ngx_stream_module_t  ngx_stream_l
     NULL,                                  /* init main configuration */
 
     ngx_stream_limit_conn_create_conf,     /* create server configuration */
-    ngx_stream_limit_conn_merge_conf,      /* merge server configuration */
+    ngx_stream_limit_conn_merge_conf       /* merge server configuration */
 };
 
 
diff --git a/src/stream/ngx_stream_map_module.c b/src/stream/ngx_stream_map_module.c
--- a/src/stream/ngx_stream_map_module.c
+++ b/src/stream/ngx_stream_map_module.c
@@ -81,7 +81,7 @@ static ngx_stream_module_t  ngx_stream_m
     NULL,                                  /* init main configuration */
 
     NULL,                                  /* create server configuration */
-    NULL,                                  /* merge server configuration */
+    NULL                                   /* merge server configuration */
 };
 
 
diff --git a/src/stream/ngx_stream_return_module.c b/src/stream/ngx_stream_return_module.c
--- a/src/stream/ngx_stream_return_module.c
+++ b/src/stream/ngx_stream_return_module.c
@@ -48,7 +48,7 @@ static ngx_stream_module_t  ngx_stream_r
     NULL,                                  /* init main configuration */
 
     ngx_stream_return_create_srv_conf,     /* create server configuration */
-    NULL,                                  /* merge server configuration */
+    NULL                                   /* merge server configuration */
 };
 
 
diff --git a/src/stream/ngx_stream_upstream.c b/src/stream/ngx_stream_upstream.c
--- a/src/stream/ngx_stream_upstream.c
+++ b/src/stream/ngx_stream_upstream.c
@@ -46,7 +46,7 @@ static ngx_stream_module_t  ngx_stream_u
     ngx_stream_upstream_init_main_conf,    /* init main configuration */
 
     NULL,                                  /* create server configuration */
-    NULL,                                  /* merge server configuration */
+    NULL                                   /* merge server configuration */
 };
 
 
diff --git a/src/stream/ngx_stream_upstream_hash_module.c b/src/stream/ngx_stream_upstream_hash_module.c
--- a/src/stream/ngx_stream_upstream_hash_module.c
+++ b/src/stream/ngx_stream_upstream_hash_module.c
@@ -84,7 +84,7 @@ static ngx_stream_module_t  ngx_stream_u
     NULL,                                  /* init main configuration */
 
     ngx_stream_upstream_hash_create_conf,  /* create server configuration */
-    NULL,                                  /* merge server configuration */
+    NULL                                   /* merge server configuration */
 };
 
 
diff --git a/src/stream/ngx_stream_upstream_least_conn_module.c b/src/stream/ngx_stream_upstream_least_conn_module.c
--- a/src/stream/ngx_stream_upstream_least_conn_module.c
+++ b/src/stream/ngx_stream_upstream_least_conn_module.c
@@ -39,7 +39,7 @@ static ngx_stream_module_t  ngx_stream_u
     NULL,                                    /* init main configuration */
 
     NULL,                                    /* create server configuration */
-    NULL,                                    /* merge server configuration */
+    NULL                                     /* merge server configuration */
 };
 
 
diff --git a/src/stream/ngx_stream_upstream_zone_module.c b/src/stream/ngx_stream_upstream_zone_module.c
--- a/src/stream/ngx_stream_upstream_zone_module.c
+++ b/src/stream/ngx_stream_upstream_zone_module.c
@@ -39,7 +39,7 @@ static ngx_stream_module_t  ngx_stream_u
     NULL,                                  /* init main configuration */
 
     NULL,                                  /* create server configuration */
-    NULL,                                  /* merge server configuration */
+    NULL                                   /* merge server configuration */
 };