From 1e57726a1313a646c6601b1e8b29544c2ade48c7 Mon Sep 17 00:00:00 2001
From: Bill <billsonnn@live.com>
Date: Wed, 21 Apr 2021 22:12:15 -0400
Subject: [PATCH] More conflicts

---
 .../result/NavigatorResultView.tsx            | 23 -------------------
 1 file changed, 23 deletions(-)

diff --git a/src/views/navigator/result-lists/result-list/result/NavigatorResultView.tsx b/src/views/navigator/result-lists/result-list/result/NavigatorResultView.tsx
index e522d080..08a303e1 100644
--- a/src/views/navigator/result-lists/result-list/result/NavigatorResultView.tsx
+++ b/src/views/navigator/result-lists/result-list/result/NavigatorResultView.tsx
@@ -39,7 +39,6 @@ export function NavigatorResultView(props: NavigatorResultViewProps): JSX.Elemen
     }
 
     return (
-<<<<<<< Updated upstream
         <div className="d-flex flex-column justify-content-center align-items-center nitro-navigator-result" onClick={ () => navigatorContext.onTryVisitRoom(result) }>
             <div className="d-flex justify-content-between w-100 px-2 py-1">
                 <div className="d-flex justify-content-center flex-grow-1 overflow-hidden">
@@ -48,28 +47,6 @@ export function NavigatorResultView(props: NavigatorResultViewProps): JSX.Elemen
                     </div>
                     <div className="d-flex flex-column justify-content-center align-items-start flex-grow-1 px-2 overflow-hidden">
                         <span className="d-block text-truncate" style={ { maxWidth: '95%' } }>{ result.roomName }</span>
-=======
-        <NavigatorContext.Consumer>
-        { navigatorContext => {
-            return <div className="d-flex flex-column justify-content-center align-items-center nitro-navigator-result" onClick={ () => navigatorContext.onTryVisitRoom(result) }>
-                        <div className="d-flex justify-content-between w-100 px-2 py-1">
-                            <div className="d-flex justify-content-center flex-grow-1 overflow-hidden">
-                                <div className={ "d-flex justify-content-center align-items-center badge text-center " + getUserCounterColor() }>
-                                    <i className="fas fa-user mr-1 small"></i> { result.userCount }
-                                </div>
-                                <div className="d-flex flex-column justify-content-center align-items-start flex-grow-1 px-2 overflow-hidden">
-                                    <span className="d-block text-truncate" style={ { maxWidth: '95%' } }>{ result.roomName }</span>
-                                </div>
-                            </div>
-                            <div className="d-flex flex-row-reverse align-items-center">
-                                <i className="fas fa-info-circle small" onClick={ openInfo }></i>
-                                { result.habboGroupId > 0 && <i className="fas fa-users mr-2 small"></i> }
-                                { result.doorMode !== RoomDataParser.OPEN_STATE && 
-                                    <i className={ "mr-2 fas small " + classNames( {'fa-lock': result.doorMode === RoomDataParser.DOORBELL_STATE, 'fa-key': result.doorMode === RoomDataParser.PASSWORD_STATE })}></i>
-                                }
-                            </div>
-                        </div>
->>>>>>> Stashed changes
                     </div>
                 </div>
                 <div className="d-flex flex-row-reverse align-items-center">