Skip to content

Commit

Permalink
Merge branch 'marcbachmann-update-uuid'
Browse files Browse the repository at this point in the history
node-uuid to uuid pull request.
  • Loading branch information
jogoodma committed Nov 25, 2016
2 parents ef792ac + d7925f3 commit f60923e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-sequence-viewer",
"version": "0.1.1",
"version": "0.1.2",
"description": "A React wrapper around the BioJS sequence-viewer component",
"main": "lib/index.js",
"jsnext:main": "es/index.js",
Expand All @@ -23,8 +23,8 @@
"bootstrap": "^3.3.7",
"handlebars": "3.0.2",
"jquery": "^3.1.0",
"node-uuid": "^1.4.7",
"sequence-viewer": "^0.2.18"
"sequence-viewer": "^0.2.18",
"uuid": "^3.0.0"
},
"peerDependencies": {
"react": "15.x"
Expand Down
2 changes: 1 addition & 1 deletion src/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, {PropTypes, Component} from 'react';
import { v4 } from 'node-uuid';
import { v4 } from 'uuid';

import Bootstrap from 'bootstrap/dist/css/bootstrap.min.css';
// See nwb.config.js for some webpack magic that allows this to work.
Expand Down

0 comments on commit f60923e

Please sign in to comment.