# Conflicts:
#   module/Application/src/Controller/ApiController.php
#   module/Application/view/application/admin/antrianadmin.phtml
#   module/Application/view/application/admin/registrasidokter.phtml
#   public/action-js/antrian-js/action-admin.js
#   public/action-js/antrian-js/action-registrasidokter.js