# Conflicts: # application/config.php # public/assets/js/require-backend.min.js # public/assets/js/require-frontend.min.js