Fix conflicts

This commit is contained in:
Pierre Burgy 2017-03-02 10:58:41 +01:00
commit 08fc750f9f

View File

@ -38,7 +38,7 @@ module.exports = {
*/
add: (values) => {
return <%= humanizeId %>.create(values);
return <%= globalID %>.create(values);
},
/**