# Conflicts: # app/command/TbCommand.php # app/common/utils/email/Emails.php # app/controller/IndexController.php # app/functions.php