fixup! fixup! Edit search label in embed config

opensupplyhub · Jan 31, 2022 · 1bc5680 · 1bc5680
1 parent 92780ac
commit 1bc5680
Showing 1 changed file with 0 additions and 23 deletions.
diff --git a/src/app/src/components/EmbeddedMapConfig.jsx b/src/app/src/components/EmbeddedMapConfig.jsx
@@ -168,7 +168,6 @@ function EmbeddedMapConfig({
                 </Grid>
                 <Grid item xs={12} md={7} lg={6}>
                     {user.embed_level === 3 ? (
-<<<<<<< HEAD
                         <EmbeddedMapFieldsConfig
                             fields={fields}
                             setFields={setFields}
@@ -185,28 +184,6 @@ function EmbeddedMapConfig({
                             )}
                             errors={errors}
                         />
-=======
-                        <>
-                            <EmbeddedMapFieldsConfig
-                                fields={fields}
-                                setFields={setFields}
-                                preferContributorName={preferContributorName}
-                                setPreferContributorName={updateEmbedConfig(
-                                    'preferContributorName',
-                                )}
-                                errors={errors}
-                            />
-                            <EmbeddedMapSearchLabelConfig
-                                anyFieldSearchable={fields.some(
-                                    field => field.searchable,
-                                )}
-                                textSearchLabel={textSearchLabel}
-                                setTextSearchLabel={updateEmbedConfig(
-                                    'textSearchLabel',
-                                )}
-                            />
-                        </>
->>>>>>> af993dceb0abcea2f873749559f5d6685d1c6b7a
                     ) : null}
 
                     <EmbeddedMapThemeConfig