Skip to content

Commit 8a381fe

Browse files
Vikram KaltaVikram Kalta
authored andcommitted
fix: resolved conflicts
2 parents e20e0a2 + ea8e105 commit 8a381fe

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

package-lock.json

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

package.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,15 @@
6161
"version": "oclif-dev readme && git add README.md"
6262
},
6363
"dependencies": {
64+
<<<<<<< HEAD
6465
"@contentstack/cli-command": "^1.2.10",
6566
"@contentstack/cli-utilities": "^1.5.0",
6667
"@contentstack/management": "^1.8.0",
68+
=======
69+
"@contentstack/cli-command": "^1.2.9",
70+
"@contentstack/cli-utilities": "^1.4.5",
71+
"@contentstack/management": "^1.10.1",
72+
>>>>>>> snyk-upgrade-1895b915a714870bedb2750f974ae844
6773
"cli-table3": "^0.6.0",
6874
"cli-ux": "^6.0.9",
6975
"inquirer": "^8.2.4",

0 commit comments

Comments
 (0)