docs: remove missed git merge conflict from MD file (#6379)

Co-authored-by: Jeremy Long <[email protected]>

maven/src/site/markdown/configuration.md

@@ -148,13 +148,8 @@ nvdApiKey | The API Key to access the NVD API; obtained from http
 nvdApiEndpoint | The NVD API endpoint URL; setting this is uncommon. | https://services.nvd.nist.gov/rest/json/cves/2.0 |
 nvdApiServerId | The id of a server defined in the settings.xml that configures the credentials (password is used as ApiKey) for accessing the NVD API. |   |
 nvdMaxRetryCount | The maximum number of retry requests for a single call to the NVD API. | 10 |
-<<<<<<< Updated upstream
 nvdApiDelay | The number of milliseconds to wait between calls to the NVD API. | 3500 with an NVD API Key or 8000 without an API Key . |
 nvdDatafeedUrl | The URL for the NVD API Data feed that can be generated using https://github.com/jeremylong/Open-Vulnerability-Project/tree/main/vulnz#caching-the-nvd-cve-data - example value `https://internal.server/cache/nvdcve-{0}.json.gz` | &nbsp; |
-=======
-nvdApiDelay | The number of milliseconds to wait between calls to the NVD API. | 2000 with an NVD API Key or 8000 without an API Key . |
-nvdDatafeedUrl | The URL for the NVD API Data feed that can be generated using https://github.com/jeremylong/Open-Vulnerability-Project/tree/main/vulnz#caching-the-nvd-cve-data - example value `https://internal.server/cache/nvdcve-{0}.json.gz` | &nbsp;
->>>>>>> Stashed changes
 nvdDatafeedServerId | The id of a server defined in the settings.xml that configures the credentials (username and password) for accessing the NVD API Data feed.| &nbsp; |
 nvdUser | Credentials used for basic authentication for the NVD API Data feed. | &nbsp; |
 nvdPassword | Credentials used for basic authentication for the NVD API Data feed. The `nvdDatafeedServerId` configuration should be used instead to store the secret securely. If the secret is placed directly in the configuration and you use -X the secret will be written to the standard out. | &nbsp; |