From 9703bc86455d9f89eb455d16fb069643b2ccd059 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Mon, 12 Feb 2018 15:58:12 -0700
Subject: [PATCH] lint

---
 services/i18n.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/services/i18n.js b/services/i18n.js
index 863b5aac2..666f15a59 100644
--- a/services/i18n.js
+++ b/services/i18n.js
@@ -2,7 +2,7 @@ const fs = require('fs');
 const path = require('path');
 const debug = require('debug')('talk:services:i18n');
 const accepts = require('accepts');
-const { get, has } = require('lodash');
+const { get, has, merge } = require('lodash');
 const yaml = require('yamljs');
 const plugins = require('./plugins');
 const { DEFAULT_LANG } = require('../config');
@@ -27,7 +27,7 @@ let translations = fs
   .reduce((packs, contents) => {
     const pack = yaml.parse(contents);
 
-    return _.merge(packs, pack);
+    return merge(packs, pack);
   }, {});
 
 // Create a list of all supported translations.
@@ -55,7 +55,7 @@ const loadPluginTranslations = () => {
 
       const pack = yaml.parse(fs.readFileSync(filename, 'utf8'));
 
-      translations = _.merge(translations, pack);
+      translations = merge(translations, pack);
     });
 
   loadedPluginTranslations = true;