Skip to content

Commit

Permalink
Resolved merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
andris9 committed Nov 5, 2024
2 parents 6123c0e + 5af02f3 commit 3546532
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,5 +1,12 @@
# Changelog

## [1.0.8](https://github.com/postalsys/vmc/compare/v1.0.7...v1.0.8) (2024-02-05)


### Bug Fixes

* **deploy:** include package-lock file ([593c56a](https://github.com/postalsys/vmc/commit/593c56a8be7fba223c6a0dcdf48a2af446b13ba9))

## [1.0.7](https://github.com/postalsys/vmc/compare/v1.0.6...v1.0.7) (2024-02-05)


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": "@postalsys/vmc",
"version": "1.0.7",
"version": "1.0.8",
"description": "Parse VMC logo files",
"main": "lib/vmc.js",
"scripts": {
Expand Down

0 comments on commit 3546532

Please sign in to comment.