# Conflicts:
#	api/index.js
#	api/meter/meter-entrust.js
#	components/base/AutoCompletes.vue
#	components/file/file-manage/FileManageCont.vue
#	components/file/file-manage/FilesList.vue
#	components/import/DownloadTemplateImport.vue
#	components/operation/Operation.vue
#	components/select-equip/SelEquip.vue
#	components/table/PTVXETable.vue
#	ecosystem.config.js
#	env/.env.production
#	nuxt.config.js
#	pages/meter-aptitude/manage/MeterAptitudeManage.vue
#	pages/meter-aptitude/standard/MeterAptitudeStandard.vue
#	plugins/global.js
#	plugins/iframe.js
#	router/meter-routes.js

# Conflicts:
#	pages/soil-sample-manage/sample-preparation/Preparation.vue