From af712838640a079fdc1a3d80ba43338f533bfb5d Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Tue, 31 Jul 2018 15:06:16 +0800
Subject: [PATCH] fix conflict

---
 .../assets/js/pages/booking/uploadUserBankSlip.vue   | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/resources/assets/js/pages/booking/uploadUserBankSlip.vue b/resources/assets/js/pages/booking/uploadUserBankSlip.vue
index 56f2470f..2f39ab48 100644
--- a/resources/assets/js/pages/booking/uploadUserBankSlip.vue
+++ b/resources/assets/js/pages/booking/uploadUserBankSlip.vue
@@ -1,16 +1,5 @@
 <template>
 	<el-main>
-		<<<<<<< HEAD <progress-track v-model="status" />
-		<div align="center" v-if="booking.user_bankslip_path">
-			<h1 class="alert-heading">Your Bank Slip Has Been Rejected</h1>
-			<p>Reason : {{ booking.reject_reason }}</p>
-			<p>Please Reupload Your Bank Slip</p>
-			<hr>
-		</div>
-		<div v-else>
-			<h1>Waiting For Payment</h1>
-		</div>
-		=======
 		<progress-track v-model="status" />
 		<div align="center" v-if="booking.user_bankslip_path">
 			<h4 style="margin-top:5%">
@@ -23,7 +12,6 @@
 		<div v-else align="center">
 			<h1>Please Upload Bankslip</h1>
 		</div>
-		>>>>>>> 12fd1676189e5e62e226b96068bfba6afa4af8e5
 
 		<div class="row">
 			<table class="table table-striped">