merge conflic resolved

2021-07-07 16:39:03 -07:00
parent e30868c072 d1ea1d7658
commit 4975084eef
2 changed files with 1041 additions and 893 deletions
@@ -29,8 +29,10 @@ const messages =
  allMessages.en;

 ReactDOM.render(
-  <IntlProvider locale={language} messages={messages} textComponent={React.Fragment}>
-    <TinodeWeb />
-  </IntlProvider>,
+  <React.StrictMode>
+    <IntlProvider locale={language} messages={messages} textComponent={React.Fragment}>
+      <TinodeWeb />
+    </IntlProvider>
+  </React.StrictMode>,
  document.getElementById('mountPoint')
 );