fix(branching): fix merge conflicts

nurikk · Jul 22, 2021 · fe6223e · fe6223e
1 parent 97de478
commit fe6223e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/src/components/groups/DeviceGroupRow.tsx b/src/components/groups/DeviceGroupRow.tsx
@@ -6,11 +6,7 @@ import cx from 'classnames';
 import { Link } from "react-router-dom";
 import DeviceImage from "../device-image";
 import { GroupAddress, WithDevices } from "../../store";
-<<<<<<< HEAD
-
-=======
 import { useTranslation } from "react-i18next";
->>>>>>> origin/master
 
 
 type DeviceGroupRowProps = {

diff --git a/src/components/settings/index.tsx b/src/components/settings/index.tsx
@@ -145,7 +145,7 @@ export class SettingsPage extends Component<PropsFromStore & SettingsPageProps &
         const { missingTranslations, i18n } = this.props;
         const currentLanguage = i18n.language.split('-')[0];
 
-        const url = `https://github.com/nurikk/z2m-frontend/edit/master/src/i18n/locales/${currentLanguage}.json`;
+        const url = `https://github.com/nurikk/z2m-frontend/edit/dev/src/i18n/locales/${currentLanguage}.json`;
         return <div className="p-3">
             <p>This page contains missing translation keys.</p>
             <p>You can navigate to different pages to collect missing tranlations and come back here again (don't referesh browser page).</p>