d

src/app/game-grid/game-grid.component.html

@@ -26,26 +26,6 @@
 
 </mat-toolbar>
 
-<<<<<<< HEAD
-=======
-<div class="row">
-	<div class="col-sm-6 text-center">
-		 <ul class="pagination">
-		 	<li *ngFor="#item of queryMaxPages; #i = index"><a href="#">1</a></li>
-		 </ul>
-	</div>
-</div>
-
-
-<div class="row">
-	<div class="col-sm-6 text-center">
-		<button *ngIf="showBack" class="btn btn-primary" (click)="backPage()">Back Page</button>
-	</div>
-	<div class="col-sm-6 text-center">
-		<button *ngIf="showNext" class="btn btn-primary" (click)="nextPage()">Next Page</button>
-	</div>
-</div>
->>>>>>> abfe4ee830cfae95721bac32b34103b2538680eb
 
 <div *ngIf="isEmptyObject(gamesData)">
 	<div class="flex-container" >