From 0a07a1359fc2efbb5aa7f9c1a7db0b6bdd428a7b Mon Sep 17 00:00:00 2001
From: vantezzen <properly@protonmail.com>
Date: Sat, 7 Sep 2019 20:44:09 +0200
Subject: Fix errors in 5.3.0 version merge

---
 src/components/settings/settings/EditSettingsForm.js | 16 +++++++++-------
 src/components/ui/PremiumFeatureContainer/index.js   |  2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index df91929cb..b59e3a74a 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -283,13 +283,15 @@ export default @observer class EditSettingsForm extends Component {
             </p>
             <p className="settings__message">
               <span className="mdi mdi-github-face" />
-              Ferdi is based on
-              {' '}
-              <a href="https://github.com/meetfranz/franz" target="_blank">Franz</a>
-              , a project published
-              under the
-              {' '}
-              <a href="https://github.com/meetfranz/franz/blob/master/LICENSE" target="_blank">Apache-2.0 License</a>
+              <span>
+                Ferdi is based on
+                {' '}
+                <a href="https://github.com/meetfranz/franz" target="_blank">Franz</a>
+                , a project published
+                under the
+                {' '}
+                <a href="https://github.com/meetfranz/franz/blob/master/LICENSE" target="_blank">Apache-2.0 License</a>
+              </span>
             </p>
           </form>
         </div>
diff --git a/src/components/ui/PremiumFeatureContainer/index.js b/src/components/ui/PremiumFeatureContainer/index.js
index c53d345a0..7ba353be3 100644
--- a/src/components/ui/PremiumFeatureContainer/index.js
+++ b/src/components/ui/PremiumFeatureContainer/index.js
@@ -9,7 +9,7 @@ import { oneOrManyChildElements } from '../../../prop-types';
 import UserStore from '../../../stores/UserStore';
 
 import styles from './styles';
-import { FeatureStore } from '../../../features/utils/FeatureStore';
+import FeatureStore from '../../../stores/FeaturesStore';
 
 const messages = defineMessages({
   action: {
-- 
cgit v1.2.3-54-g00ecf