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