Skip to content

Commit 2535650

Browse files
Fixed merge conflits
1 parent 3e2df96 commit 2535650

File tree

4 files changed

+82
-74
lines changed

4 files changed

+82
-74
lines changed

package-lock.json

Lines changed: 73 additions & 73 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/contentstack-config/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -362,6 +362,10 @@ EXAMPLES
362362
363363
$ csdx config:set:region EU
364364
365+
$ csdx config:set:region AWS-NA
366+
367+
$ csdx config:set:region AWS-EU
368+
365369
$ csdx config:set:region AZURE-NA
366370
367371
$ csdx config:set:region AZURE-EU

packages/contentstack-import/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"version": "1.21.0",
55
"author": "Contentstack",
66
"bugs": "https://github.com/contentstack/cli/issues",
7-
7+
"dependencies": {
88
"@contentstack/cli-audit": "~1.11.0",
99
"@contentstack/cli-command": "~1.4.0",
1010
"@contentstack/cli-utilities": "~1.10.0",

packages/contentstack/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3582,6 +3582,10 @@ EXAMPLES
35823582
35833583
$ csdx config:set:region EU
35843584
3585+
$ csdx config:set:region AWS-NA
3586+
3587+
$ csdx config:set:region AWS-EU
3588+
35853589
$ csdx config:set:region AZURE-NA
35863590
35873591
$ csdx config:set:region AZURE-EU

0 commit comments

Comments
 (0)