Add alert msg

parent 49e51844
...@@ -597,14 +597,11 @@ ...@@ -597,14 +597,11 @@
<div class="col-md-12"> <div class="col-md-12">
<div class="contect_btn contect_btn_contact"> <div class="contect_btn contect_btn_contact">
<ul> <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 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>
<li style="display:none;" id="confirm_txt"> <li style="display:none;" id="confirm_txt">
<h4><b> Successfully Confirm Trip Plan </b></h4> <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> <li><a href="javascript:void(0)" onclick="confirmTripPlan();">Confirm Plan <i class="fa fa-arrow-right"></i></a>
>>>>>>> a166926317a3667f1ad1652bc05d08fed82cb9ac
</li> </li>
</ul> </ul>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment