Fix merge conflicts.

Signed-off-by: Naarcha-AWS <naarcha@amazon.com>
This commit is contained in:
Naarcha-AWS 2022-05-03 14:00:41 -05:00
commit 576baef83a
2 changed files with 3 additions and 4 deletions

View File

@ -1,7 +1,6 @@
{ {
"current": "2.0", "current": "1.3",
"all": [ "all": [
"2.0",
"1.3", "1.3",
"1.2", "1.2",
"1.1", "1.1",

View File

@ -1,8 +1,8 @@
/* During build, DOC_VERSIONS is prefixed to convey all the versions available, informed by `_data/versions.json` /* During build, DOC_VERSIONS is prefixed to convey all the versions available, informed by `_data/versions.json`
* Example: * Example:
* const DOC_VERSIONS = ["1.1","1.0"]; * const DOC_VERSIONS = ["1.1","1.0"];
* *
* DOC_VERSION_LATEST will picl `latest`, or in its absence the `current` version. * DOC_VERSION_LATEST will pick `latest`, or in its absence the `current` version.
* const DOC_VERSION_LATEST = "2.0"; * const DOC_VERSION_LATEST = "2.0";
*/ */
const PREFIX = "OpenSearch "; const PREFIX = "OpenSearch ";