# Conflicts:
# addons/qiniu/config.php
# application/admin/controller/Dan.php
# application/admin/controller/Duo.php
# application/admin/controller/Hobby.php
# application/admin/controller/Study.php
# application/admin/controller/user/User.php
# application/admin/validate/User.php
# application/admin/view/dan/add.html
# application/admin/view/dan/edit.html
# application/admin/view/duo/add.html
# application/admin/view/duo/edit.html
# application/admin/view/hobby/index1.html
# application/admin/view/user/user/add.html
# application/admin/view/user/user/edit.html
# application/admin/view/user/user/index.html
# application/api/controller/Exam.php
# application/api/controller/Lists.php
# application/api/controller/User.php
# application/extra/addons.php
# application/index/controller/Index.php
# application/index/view/index/index.html
# application/nsms/nsms.php
# public/api.html
# public/assets/css/index.css
# public/assets/js/backend/dan.js
# public/assets/js/backend/duo.js
# public/assets/js/backend/hobby.js
# public/assets/js/backend/pan.js
# public/assets/js/backend/study.js
# public/assets/js/backend/third_study.js
# public/assets/js/backend/user/user.js
