Conflicts: wisenergy-web-admin/src/main/resources/application-test.yml
Attach a file by drag & drop or click to upload
