Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

merge conflict.

  • Loading branch information...
commit b1099c3c84c8a1db3660154264be0b6dfea94f9a 2 parents 7b4fab7 + dc381de
@mikeal mikeal authored
Showing with 2 additions and 1 deletion.
  1. +2 −1  package.json
View
3  package.json
@@ -2,7 +2,7 @@
"author": "Elijah Insua <tmpvar@gmail.com> (http://tmpvar.com)",
"name": "tpad",
"description": "an array of hackable pressure sensitive buttons",
- "version": "0.0.4",
+ "version": "0.0.5",
"contributors": [
{
"name": "Mikeal Rogers",
@@ -24,6 +24,7 @@
"optimist": "~0.3.4",
"tar": "~0.1.13",
"semver": "1.0.14"
+ "chip.avr.lufacdc": "0.0.1"
},
"bin": {
"tpad": "./bin/tpad"
Please sign in to comment.
Something went wrong with that request. Please try again.