Skip to content

Commit

Permalink
Merge branch 'master' into core
Browse files Browse the repository at this point in the history
Conflicts:
	package-lock.json
	package.json
  • Loading branch information
tungs committed Dec 27, 2021
2 parents 53ca77e + 819ded2 commit 97473d1
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions package-lock.json

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

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "timesnap-core",
"version": "0.3.2-prerelease",
"version": "0.3.2",
"description": "Take screenshots of web pages at smooth intervals",
"repository": {
"type": "git",
Expand All @@ -18,7 +18,7 @@
},
"license": "BSD-3-Clause",
"dependencies": {
"timeweb": "^0.2.0",
"timeweb": "^0.2.1",
"sprintf-js": "1.1.1"
},
"devDependencies": {
Expand Down

0 comments on commit 97473d1

Please sign in to comment.