Эх сурвалжийг харах

Conflict resolved in token input screen

Vijayakrishnan 3 жил өмнө
parent
commit
f37afe1921

+ 1 - 6
resources/views/confirm-auth-token.blade.php

@@ -18,13 +18,8 @@
         <strong>
           Please enter the code sent to {{ $maskedCellNumber }}.
         </strong>
-<<<<<<< HEAD
       </div>
-      <input class="form-control" name="confirmation_token" autocomplete="off" autofocus placeholder="" required value="{{old('confirmation_token')}}">
-=======
-      </label>
-      <input type="number" class="form-control" name="confirmation_token" autocomplete="off" autofocus required value="{{old('confirmation_token')}}">
->>>>>>> e1b2b5645e5d58029b8fed8f56beb3a535ed4ea4
+      <input type="tel" class="form-control" name="confirmation_token" autocomplete="off" autofocus required value="{{old('confirmation_token')}}">
     </div>
     <div class="row">
       <div class="col-12 text-center">