Skip to content

Commit

Permalink
fix(conflict): resolved conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
opensrc0 committed Jul 29, 2024
2 parents 74bbb1d + 029f5f3 commit 5bca17e
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## [1.6.1](https://github.com/opensrc0/fe-pilot/compare/v1.6.0...v1.6.1) (2024-7-19)


### Bug Fixes

* **package.json:** removed index file generation ([a63897f](https://github.com/opensrc0/fe-pilot/commit/a63897f06fb347a6ce2a04fabcd74d29786cc3f1))

# [1.6.0](https://github.com/opensrc0/fe-pilot/compare/v1.5.3...v1.6.0) (2024-7-18)


Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "fe-pilot",
"version": "1.6.0",
"version": "1.6.1",
"description": "scanner in web, phonebook in web, autofill otp in web, share web, TextToSpeech in web, Voice Recognition in web, live location tracking in web, detect my location web, wakelock in web, color picker, WhatsappShare, SnapScanner, NetworkMonitor, View360",
"main": "index.js",
"scripts": {
Expand Down

0 comments on commit 5bca17e

Please sign in to comment.