# Conflicts: # dmp-frontend/src/app/ui/description/listing/description-listing.component.ts # dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts |
||
---|---|---|
.. | ||
description-listing-item.component.html | ||
description-listing-item.component.scss | ||
description-listing-item.component.ts |