Fixes conflicts

2016-01-22 11:58:46 +01:00
parent 890e3b76a8 7944b4aaa6
commit 1a8e5ff3bd
6 changed files with 27 additions and 3 deletions
--- a/package.json
+++ b/package.json
@@ -1,11 +1,11 @@
 {
  "name": "cartoassets",
  "description": "Share frontend assets between different CartoDB repositories",
-  "version": "0.1.17",
+  "version": "0.1.19",
  "homepage": "https://github.com/cartodb/CartoAssets",
  "author": {
-    "name": "xavijam",
-    "email": "xavijam@gmail.com"
+    "name": "CartoDB",
+    "email": "contact@cartodb.com"
  },
  "contributors": [
    "Javier Álvarez <jmedina@cartodb.com>",