Finalized project

.gitignore

+<<<<<<< HEAD
 .history/
-images/
\ No newline at end of file
+images/
+=======
+images/
+.history/
+>>>>>>> a166926317a3667f1ad1652bc05d08fed82cb9ac

train_planned.php

@@ -597,10 +597,14 @@
 							<div class="col-md-12">
 								<div class="contect_btn contect_btn_contact">
 									<ul>
+<<<<<<< HEAD
 										<li style="display:block;" id="confirm_btn"><a href="javascript:void(0)" id="confirm_btn" onclick="confirmTripPlan();">Confirm Plan <i class="fa fa-arrow-right"></i></a>
 										</li>
 										<li style="display:none;" id="confirm_txt"> 
 											<h4><b> Successfully Confirm Trip Plan </b></h4>
+=======
+										<li><a href="javascript:void(0)" onclick="confirmTripPlan();">Confirm Plan <i class="fa fa-arrow-right"></i></a>
+>>>>>>> a166926317a3667f1ad1652bc05d08fed82cb9ac
 										</li>
 									</ul>
 								</div>
@@ -730,8 +734,11 @@
 								icon: 'fa fa-check-circle',
 								msg: 'Successfully confirm your plan.'
 							});
+<<<<<<< HEAD
 							document.getElementById('confirm_btn').style.display = "none";
 							document.getElementById('confirm_txt').style.display = "block";
+=======
+>>>>>>> a166926317a3667f1ad1652bc05d08fed82cb9ac
                         }            
                 } 
             }