# Conflicts: # application/admin/controller/CourseStore.php # application/admin/view/course_store/edit.html # application/api/controller/Course.php # application/config.php # public/api.html