Enter

Author: javapyscript

src/app/deal-page/main-area/main-area.component.html

@@ -23,10 +23,6 @@ <h3 class="identity">You ({{this.cardData.userScore}})</h3>
     </div>
     <br>
     <div class="flexBox">
-<<<<<<< HEAD
         <h3 class="gameResult">{{this.cardData.gameResult}}</h3>
-=======
-        <h3 style="color:white; font-weight: lighter;">{{this.cardData.gameResult}}</h3>
->>>>>>> b5f5d232ee2c6eb0f8794b63f43ca1abb89d743a
     </div>
 </div>