From 6abc72c7f2535eb4592c7ce61c3c0cdcd4fc5414 Mon Sep 17 00:00:00 2001 From: Timo Date: Wed, 2 Jun 2021 16:19:55 +0300 Subject: [PATCH] fixed conflict --- .../dossier/components/file-actions/file-actions.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/red-ui/src/app/modules/dossier/components/file-actions/file-actions.component.html b/apps/red-ui/src/app/modules/dossier/components/file-actions/file-actions.component.html index a139218a4..fe17ddc09 100644 --- a/apps/red-ui/src/app/modules/dossier/components/file-actions/file-actions.component.html +++ b/apps/red-ui/src/app/modules/dossier/components/file-actions/file-actions.component.html @@ -117,7 +117,7 @@