Skip to content

Commit 012bf53

Browse files
authored
Merge pull request #18 from chatwoot/main
Main
2 parents e8ffdda + 440537f commit 012bf53

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

examples/yarn.lock

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -704,6 +704,11 @@
704704
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
705705
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
706706

707+
<<<<<<< HEAD
708+
"@chatwoot/react-native-widget@^0.0.3":
709+
version "0.0.3"
710+
resolved "https://registry.yarnpkg.com/@chatwoot/react-native-widget/-/react-native-widget-0.0.3.tgz#072b74d8fcb17564b8529bc537d33e0159787870"
711+
=======
707712
"@chatwoot/react-native-widget@../chatwoot-react-native-widget-0.0.6.tgz":
708713
version "0.0.6"
709714
resolved "../chatwoot-react-native-widget-0.0.6.tgz#671d5a500ad9f5544597af5231fe7fbf9c9789c1"
@@ -713,6 +718,7 @@
713718
"@chatwoot/react-native-widget@^0.0.3":
714719
version "0.0.3"
715720
resolved "https://registry.npmjs.org/@chatwoot/react-native-widget/-/react-native-widget-0.0.3.tgz#072b74d8fcb17564b8529bc537d33e0159787870"
721+
>>>>>>> develop
716722
integrity sha512-fhvc2mhIXHd039kJEthLt92yQcOR6ApeMOGFmDc2JXFlGE46d+oKJuVjU1x1lMtUT6Ndez6nGbrtp89ev6Ntpg==
717723
dependencies:
718724
react-native-modal "^11.7.0"

0 commit comments

Comments
 (0)