Fixed merge conflicts

smirko-dev · Nov 28, 2020 · 1c9517a · 1c9517a
1 parent 6f3554a
commit 1c9517a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/app/index.js b/app/index.js
@@ -36,6 +36,7 @@ messaging.peerSocket.onmessage = (evt) => {
   if (evt.data === "distance") {
     activitySelection = ActivitySelection.DIST;
   }
+  else if (evt.data === "floors") {
     activitySelection = ActivitySelection.FLOORS;
   }
   else if (evt.data === "calories") {

diff --git a/screenshots/settings.png b/screenshots/settings.png
diff --git a/settings/index.jsx b/settings/index.jsx
@@ -1,5 +1,4 @@
 
-function settingsFunc(props){
 import { gettext } from "i18n";
 
 function settingsFunc(props) {
@@ -12,7 +11,6 @@ function settingsFunc(props) {
     <Page>
         <Section>
             <Select 
-                label={`User activity`}
                 label={`${title}`}
                 settingsKey="activity"
                 options={[