fix

Author: shwstppr

ui/src/config/section/infra.js

@@ -23,11 +23,8 @@ import clusters from '@/config/section/infra/clusters'
 import hosts from '@/config/section/infra/hosts'
 import primaryStorages from '@/config/section/infra/primaryStorages'
 import secondaryStorages from '@/config/section/infra/secondaryStorages'
-<<<<<<< HEAD
 import secondaryStagingStorages from '@/config/section/infra/secondaryStagingStorages'
-=======
 import backupRepositories from '@/config/section/infra/backupRepositories'
->>>>>>> apache/main
 import objectStorages from '@/config/section/infra/objectStorages'
 import systemVms from '@/config/section/infra/systemVms'
 import routers from '@/config/section/infra/routers'
@@ -55,11 +52,8 @@ export default {
     hosts,
     primaryStorages,
     secondaryStorages,
-<<<<<<< HEAD
     secondaryStagingStorages,
-=======
     backupRepositories,
->>>>>>> apache/main
     objectStorages,
     systemVms,
     routers,