fix conflict

src/client/js/components/Navbar/GrowiSubNavigation.jsx

@@ -206,19 +206,6 @@ const GrowiSubNavigation = (props) => {
 
         {/* Page Authors */}
         { (!isCompactMode && !isUserPage) && (
-<<<<<<< HEAD
-          <ul className="authors text-nowrap border-left d-none d-lg-block">
-            { creator != null && (
-              <li className="pb-1">
-                <PageCreator creator={creator} createdAt={createdAt} />
-              </li>
-            ) }
-            { revisionAuthor != null && (
-              <li className="mt-1 pt-1 border-top">
-                <RevisionAuthor revisionAuthor={revisionAuthor} updatedAt={updatedAt} />
-              </li>
-            ) }
-=======
           <ul className="authors text-nowrap border-left d-none d-lg-block d-edit-none">
             <li className="pb-1">
               <AuthorInfo user={creator} date={createdAt} />
@@ -226,7 +213,6 @@ const GrowiSubNavigation = (props) => {
             <li className="mt-1 pt-1 border-top">
               <AuthorInfo user={revisionAuthor} date={updatedAt} mode="update" />
             </li>
->>>>>>> master
           </ul>
         ) }
       </div>