fix conflicts

2020-10-22 10:56:36 -03:00
parent 1eb8c48f2e 32846c72b6
commit 986cf74517
11 changed files with 252 additions and 99 deletions
--- a/components/core/Navbar/Navbar.tsx
+++ b/components/core/Navbar/Navbar.tsx
@@ -3,7 +3,6 @@ import { FC } from 'react'
 import Link from 'next/link'
 import { Logo } from '@components/ui'
 import { Searchbar, UserNav } from '@components/core'
-
 interface Props {
  className?: string
 }