Merge branch 'develop'

mynetx · mynetx · commit a3d23ca5673f · 2014-06-09T15:53:44.000+02:00
diff --git a/package.json b/package.json
@@ -26,5 +26,5 @@
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
-  },
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -26,5 +26,5 @@`
`26`	`26`	`},`
`27`	`27`	`"scripts": {`
`28`	`28`	`"test": "echo \"Error: no test specified\" && exit 1"`
`29`		`- },`
	`29`	`+ }`
`30`	`30`	`}`