Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into main
Browse files Browse the repository at this point in the history
# Conflicts:
#	package.json
  • Loading branch information
fleonhard committed Oct 8, 2021
2 parents 55453e7 + 67c9aa8 commit b200e65
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion 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": "@fleonhard/node-red-knx-ui",
"version": "0.0.4",
"version": "0.0.5",
"scripts": {
"ng": "ng",
"start": "ng serve",
Expand Down

0 comments on commit b200e65

Please sign in to comment.