Skip to content

Commit 8d9a583

Browse files
harshithad0703harshithad0703
authored
Merge pull request #130 from contentstack/fix/conflicts
Fix/conflicts
2 parents 0d70304 + c6587d1 commit 8d9a583

File tree

2 files changed

+21
-13
lines changed

2 files changed

+21
-13
lines changed

‎.talismanrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ fileignoreconfig:
33
ignore_detectors:
44
- filecontent
55
- filename: package-lock.json
6-
checksum: 37863a4c87fc4813074ff1efecaa29681b2f902095832325f092470fb2846c2c
6+
checksum: 52799bf1f9a1c387a74baeecac6c1c08f22bb8abdd2a1f0e689d8ed374b47635
77
- filename: .husky/pre-commit
88
checksum: 5baabd7d2c391648163f9371f0e5e9484f8fb90fa2284cfc378732ec3192c193
99
- filename: test/request.spec.ts

‎package-lock.json

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

0 commit comments

Comments
 (0)