Skip to content

Commit

Permalink
Fixed merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
aultac committed Mar 14, 2021
2 parents 7e2dc4b + cfcde78 commit 9f0ba8d
Show file tree
Hide file tree
Showing 2 changed files with 364 additions and 272 deletions.
2 changes: 1 addition & 1 deletion oada/services/auth/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "0.0.4",
"description": "Reference implementation of OADA Authentication and Authorization server.",
"bin": {
"extendToken": "./extendToken.js"
"token": "./token.js"
},
"main": "index.js",
"repository": {
Expand Down
Loading

0 comments on commit 9f0ba8d

Please sign in to comment.