Skip to content

Commit

Permalink
Merge commit '5921898136bf37c35f44dad8f016719ff4ab3fde'
Browse files Browse the repository at this point in the history
# Conflicts:
#	.gitignore
#	lib/session.js
#	lib/store.js
#	package.json
  • Loading branch information
voxelperfect committed Oct 11, 2017
1 parent d91e8e5 commit c4ba351
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 66 deletions.
9 changes: 0 additions & 9 deletions .babelrc

This file was deleted.

52 changes: 0 additions & 52 deletions Makefile

This file was deleted.

7 changes: 2 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
"engines": {
"node": ">= 6.0.0"
},
"main": "lib/session",
"main": "src/session",
"files": [
"lib"
"src"
],
"keywords": [
"koa",
Expand Down Expand Up @@ -38,8 +38,5 @@
"pedding": "^1.0.0",
"should": "^11.2.1",
"supertest": "^3.0.0"
},
"scripts": {
"prepublish": "make build"
}
}

0 comments on commit c4ba351

Please sign in to comment.