fix(i18n): merge changes from upstream

fix #1668
HospitalRun · Jan 31, 2020 · 0726ac3 · 0726ac3
1 parent 97e01d9
commit 0726ac3
Showing 1 changed file with 0 additions and 19 deletions.
diff --git a/src/components/Navbar.tsx b/src/components/Navbar.tsx
@@ -15,24 +15,6 @@ const Navbar = () => {
           history.push('/')
         },
       }}
-<<<<<<< HEAD
-      search={{
-        onClickButton: () => {
-          // no oop
-        },
-        onChangeInput: () => {
-          // no oop
-        },
-        placeholderText: t('actions.search'),
-        buttonText: t('actions.search'),
-      }}
-      navLinks={[
-        {
-          label: t('patients.label'),
-          onClick: () => {
-            // no oop
-          },
-=======
       bg="dark"
       variant="dark"
       search={{
@@ -43,7 +25,6 @@ const Navbar = () => {
         {
           label: t('patients.label', 'patients'),
           onClick: () => {},
->>>>>>> add-translation-resources
           children: [
             {
               label: t('actions.list', 'list'),