small fix

src/components/ScrappeResult/ScrappeResult.js

@@ -6,20 +6,6 @@ import CardHouses from '../CardHouses/CardHouses';
 const ScrappeResult = ({result, type, index}) => {
     console.log(index);
     return (
-<<<<<<< HEAD
-        <>
-        {   console.log(type)}
-        
-            <div className='col-lg-12'>       
-                {/* {    (type !== undefined && type !== null) ?        
-                        (type.value === "apartments") ? <CardApartments index = {index} result={result} />
-                                            : (type.value === "houses") ? <CardHouses index ={index} result={result} /> 
-                                            : <CardTownHouses index={index} result={result} />
-                        :'' */
-                        <CardHouses index ={index} result={result} />         
-                }
-                
-=======
         <>    
         <div className='col-lg-12'>       
             {    (type !== undefined && type !== null) ?     
@@ -29,7 +15,6 @@ const ScrappeResult = ({result, type, index}) => {
                                         : <CardTownHouses index={index} result={result} />
                     : <CardApartments index = {index} result={result} />
             }
->>>>>>> a2e9c169b688cc475ad1124d2228aeb13ac65ac4
             </div>
         </>
     );