Merge remote-tracking branch 'origin/3.10' into 3.11

JumpMind · Nov 13, 2019 · 6b43dd9 · 6b43dd9
2 parents 0fe0ced + fcce937
commit 6b43dd9
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/symmetric-assemble/src/asciidoc/configuration/conflicts.ad b/symmetric-assemble/src/asciidoc/configuration/conflicts.ad
@@ -113,9 +113,8 @@ endif::pro[]
 Detection Expression:: An expression that provides additional information about the detection mechanism.  If the detection 
 mechanism is use_timestamp or use_version then this expression will be the name of the timestamp or version column.
 The detect_expression is also used to exclude certain column names from being used.  For example, to exclude column1 and column2, 
-the expression is:
-----
-excluded_column_names=column1,column2
+the expression is "`excluded_column_names=column1,column2`".
+
 ----
 
 Resolve Changes Only:: Indicates that when applying changes during an update that only data that has changed should be applied.