Fix merge conflicts on i18n

2025-03-01 10:37:43 +00:00 · 2015-07-15 10:24:44 +01:00
parent 50c9a5f1e1 f385c13d44
commit 5dc0c0e968
35 changed files with 660 additions and 379 deletions
--- a/test/social/email/61-email_spec.js
+++ b/test/social/email/61-email_spec.js
@@ -103,5 +103,4 @@ describe('email Node', function() {
        })

    });
-
 });