Merge branch 'master' into 'master'

Master See merge request !2

Merge branch 'master' into 'master'
Master See merge request !2
Eric Fernandez
2 parents 029fad3b4e c042f438b2
Showing 1 changed file Show diff stats
package.json
 {
-    "name": "foca-abm-vehiculo",
+    "name": "foca-abm-chofer",
     "version": "0.0.1",
-    "description": "Abm de vehiculo",
+    "description": "Abm de chofer",
     "main": "index.html",
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",
@@ -15,7 +15,7 @@
     ],
     "repository": {
         "type": "git",
-        "url": "http://git.focasoftware.com/npm/foca-abm-vehiculo.git"
+        "url": "http://git.focasoftware.com/npm/foca-abm-chofer.git"
     },
     "author": "Foca Software",
     "license": "ISC",
1	1	{
2		- "name": "foca-abm-vehiculo",
	2	+ "name": "foca-abm-chofer",
3	3	"version": "0.0.1",
4		- "description": "Abm de vehiculo",
	4	+ "description": "Abm de chofer",
5	5	"main": "index.html",
6	6	"scripts": {
7	7	"test": "echo \"Error: no test specified\" && exit 1",
...	...	@@ -15,7 +15,7 @@
15	15	],
16	16	"repository": {
17	17	"type": "git",
18		- "url": "http://git.focasoftware.com/npm/foca-abm-vehiculo.git"
	18	+ "url": "http://git.focasoftware.com/npm/foca-abm-chofer.git"
19	19	},
20	20	"author": "Foca Software",
21	21	"license": "ISC",