# Conflicts:
#	.dockerignore
#	.gitignore
#	README.md
#	docker/Dockerfile
#	frontend/components/client/GrpcClientTable.tsx
#	frontend/components/client/HTTPClientTable.tsx
#	frontend/components/client/TCPClientTable.tsx
#	frontend/components/event/EventTable.tsx
#	frontend/components/eventCatalogs/Create.tsx
#	frontend/components/eventCatalogs/Details.tsx
#	frontend/components/eventCatalogs/constant.ts
#	frontend/components/eventCatalogs/types.ts
#	frontend/components/index/Configuration.tsx
#	frontend/components/index/Endpoint.tsx
#	frontend/components/metrics/MetricsTable.tsx
#	frontend/components/navigation/MenuItem.tsx
#	frontend/components/navigation/Menus.tsx
#	frontend/components/navigation/MenusMobile.tsx
#	frontend/components/navigation/Sidebar.tsx
#	frontend/components/registry/RegistryTable.tsx
#	frontend/components/topic/TopicTable.tsx
#	frontend/components/workflow/Create.tsx
#	frontend/components/workflow/Details/Details.tsx
#	frontend/components/workflow/Details/Instances.tsx
#	frontend/components/workflow/Details/index.ts
#	frontend/components/workflow/constant.ts
#	frontend/components/workflow/types.ts
#	frontend/context/context.tsx
#	frontend/context/reducer.ts
#	frontend/context/type.ts
#	frontend/docker/default.conf
#	frontend/next.config.js
#	frontend/package.json
#	frontend/pages/_app.tsx
#	frontend/pages/_document.tsx
#	frontend/pages/event.tsx
#	frontend/pages/eventCatalogs.tsx
#	frontend/pages/grpc.tsx
#	frontend/pages/http.tsx
#	frontend/pages/index.tsx
#	frontend/pages/metrics.tsx
#	frontend/pages/registry.tsx
#	frontend/pages/tcp.tsx
#	frontend/pages/topic.tsx
#	frontend/pages/workflows.tsx
#	frontend/public/favicon.ico
#	frontend/static/images/logo.png
#	frontend/tsconfig.json

# Conflicts:
#	.gitattributes
#	.gitignore
#	README.md
#	docker/Dockerfile
#	eventmesh-dashboard-core/pom.xml
#	eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/EventMeshDashboardApplication.java
#	eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/config/AdminProperties.java
#	eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/config/BeanTypeConfig.java
#	eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/constant/ConfigConst.java
#	eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/constant/NacosConst.java
#	eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/controller/ConnectionController.java
#	eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/controller/MetricsController.java
#	eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/controller/SubscriptionController.java
#	eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/controller/TopicController.java
#	eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/dto/CreateTopicRequest.java
#	eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/dto/DeleteTopicRequest.java
#	eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/dto/Result.java
#	eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/enums/Status.java
#	eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/exception/BaseException.java
#	eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/exception/EventMeshAdminException.java
#	eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/exception/EventMeshException.java
#	eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/exception/GlobalExceptionHandler.java
#	eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/exception/MetaException.java
#	eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/model/ConnectionInfo.java
#	eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/model/SubscriptionInfo.java
#	eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/model/TopicProperties.java
#	eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/ConnectionService.java
#	eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/SubscriptionService.java
#	eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/TopicService.java
#	eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/meta/EtcdConnectionService.java
#	eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/meta/EtcdSubscriptionService.java
#	eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/meta/NacosConnectionService.java
#	eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/meta/NacosSubscriptionService.java
#	eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/store/RocketmqTopicService.java
#	eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/util/ExceptionUtil.java
#	eventmesh-dashboard-core/src/main/resources/application-dev.yml
#	eventmesh-dashboard-core/src/main/resources/logback.xml
#	pom.xml
#	style/checkstyle-header1.txt