Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	package.json
  • Loading branch information
davelandry committed Mar 13, 2017
2 parents ef4cc0b + de9354e commit f4f8bab
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,6 @@
"test": "d3plus-test"
},
"devDependencies": {
"d3plus-dev": "^0.1.14"
"d3plus-dev": "^0.3.1"
}
}

0 comments on commit f4f8bab

Please sign in to comment.