aboutsummaryrefslogtreecommitdiffstats
path: root/src/components/layout
diff options
context:
space:
mode:
authorLibravatar vantezzen <properly@protonmail.com>2019-09-07 15:53:51 +0200
committerLibravatar vantezzen <properly@protonmail.com>2019-09-07 15:53:51 +0200
commit728c3ea49ac0d7d5df11869a3c7ebf715e528330 (patch)
tree024b015eeee6783bb260d6104bc69ad83f1666ec /src/components/layout
parentRemove analytics (diff)
downloadferdium-app-728c3ea49ac0d7d5df11869a3c7ebf715e528330.tar.gz
ferdium-app-728c3ea49ac0d7d5df11869a3c7ebf715e528330.tar.zst
ferdium-app-728c3ea49ac0d7d5df11869a3c7ebf715e528330.zip
Fix merge bugs
Diffstat (limited to 'src/components/layout')
-rw-r--r--src/components/layout/AppLayout.js1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js
index ed004d07e..c1979ff10 100644
--- a/src/components/layout/AppLayout.js
+++ b/src/components/layout/AppLayout.js
@@ -107,7 +107,6 @@ class AppLayout extends Component {
107 areRequiredRequestsSuccessful, 107 areRequiredRequestsSuccessful,
108 retryRequiredRequests, 108 retryRequiredRequests,
109 areRequiredRequestsLoading, 109 areRequiredRequestsLoading,
110 isDelayAppScreenVisible,
111 hasActivatedTrial, 110 hasActivatedTrial,
112 } = this.props; 111 } = this.props;
113 112