#304 Resolve merge conflicts.

Author: adamjstone

cicd/modules/BuildAndDeployment.psm1

@@ -91,8 +91,8 @@ $ExampleServiceApplicationNamespace = "RapidField.SolidInstruments.Example.Servi
 $ExampleWebApplicationNamespace = "RapidField.SolidInstruments.Example.WebApplication";
 
 # Regular expressions
-$ValidCommitMessageRegularExpressionPattern = "^#[1-9][0-9]{0,4} [A-Z][A-Za-z0-9\,\.\!\;\:\'\""\@\#\$\%\^\&\*\-\+\=_\(\)\[\]\{\}\|\\\/\s]{21,89}$";
-$ValidPullRequestTitleRegularExpressionPattern = "^[1-9][0-9]{0,4} [A-Z][A-Za-z0-9\,\.\!\;\:\'""\@\#\$\%\^\&\*\-\+\=_\(\)\[\]\{\}\|\\\/\s]{21,144}$";
+$ValidCommitMessageRegularExpressionPattern = "^(#[1-9][0-9]{0,4} )?[A-Z][A-Za-z0-9\,\.\!\;\:\'\""\@\#\$\%\^\&\*\-\+\=_\(\)\[\]\{\}\|\\\/\s]{21,144}$";
+$ValidPullRequestTitleRegularExpressionPattern = "^(#[1-9][0-9]{0,4} )?[A-Z][A-Za-z0-9\,\.\!\;\:\'""\@\#\$\%\^\&\*\-\+\=_\(\)\[\]\{\}\|\\\/\s]{21,144}$";
 
 # Environment variables
 $BuildVersion = $env:APPVEYOR_BUILD_VERSION;