Fixing merge

1 files changed, 6 insertions, 1 deletions

diff --git a/web/react/components/setting_item_min.jsx b/web/react/components/setting_item_min.jsx
index ffd2061fe..db5513b14 100644
--- a/web/react/components/setting_item_min.jsx
+++ b/web/react/components/setting_item_min.jsx
@@ -1,6 +1,8 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
+import {FormattedMessage} from 'mm-intl';
+
 export default class SettingItemMin extends React.Component {
     render() {
         let editButton = null;
@@ -13,7 +15,10 @@ export default class SettingItemMin extends React.Component {
                         onClick={this.props.updateSection}
                     >
                         <i className='fa fa-pencil'/>
-                        {'Edit'}
+                        <FormattedMessage
+                            id='setting_item_min.edit'
+                            defaultMessage='Edit'
+                        />
                     </a>
                 </li>
             );