Merge branch 'issue-83' of https://github.com/janus-idp/janus-idp.git…

…hub.io into issue-83
janus-idp · Jun 14, 2023 · acab65d · acab65d
2 parents 331bf59 + d9865bd
commit acab65d
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/packages/ui/components/plugin-grid/plugin-grid.tsx b/packages/ui/components/plugin-grid/plugin-grid.tsx
@@ -102,7 +102,6 @@ export function PluginsGrid({ pluginsFuse, pluginsList }: PluginsFeaturesProps):
   }, [pluginCategory.name, pluginsFuse, pluginsList, search]);
 
   return (
-<<<<<<< HEAD
     <section className="container flex w-full flex-col p-8">
       <PluginSearchbar
         search={search}
@@ -112,11 +111,6 @@ export function PluginsGrid({ pluginsFuse, pluginsList }: PluginsFeaturesProps):
       />
       <div className="grid gap-4 sm:grid-cols-1 md:grid-cols-2 lg:grid-cols-3">
         {plugins.map((plugin) => (
-=======
-    <section className="container flex w-full p-8">
-      <div className="grid gap-4 sm:grid-cols-1 md:grid-cols-2 lg:grid-cols-3">
-        {pluginsList.map((plugin) => (
->>>>>>> c9c4caf (fix:(monorepo): enable tailwind prettier plugin (#89))
           <PluginTile key={plugin.title} {...plugin} />
         ))}
       </div>