Skip to content

Commit

Permalink
fix(resolved conflicts): conflicts resolved
Browse files Browse the repository at this point in the history
  • Loading branch information
opensrc0 committed Feb 26, 2024
2 parents aa032e2 + 2006ebb commit d2f97d4
Show file tree
Hide file tree
Showing 3 changed files with 11 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.0.1](https://github.com/opensrc0/fe-pilot/compare/v1.0.0...v1.0.1) (2024-2-26)


### Bug Fixes

* **__build:** added __build folder to release in npm ([5ce1e2f](https://github.com/opensrc0/fe-pilot/commit/5ce1e2fa5cf17440957d9ed226462803a7c0ecde))

# 1.0.0 (2024-2-26)


Expand Down
5 changes: 3 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.0.0",
"version": "1.0.1",
"description": "Advance JS features, Plug & Play",
"main": "",
"scripts": {
Expand Down

0 comments on commit d2f97d4

Please sign in to comment.