From cdf0409556ab2fbd6ac1660e9fc4ed76da68ca12 Mon Sep 17 00:00:00 2001 From: Ioannis Igoumenos Date: Mon, 16 Dec 2024 12:04:54 +0200 Subject: [PATCH] fix rebase remaining message --- app/src/Model/Table/IdentifiersTable.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/src/Model/Table/IdentifiersTable.php b/app/src/Model/Table/IdentifiersTable.php index 7337eccb4..5c7dad46d 100644 --- a/app/src/Model/Table/IdentifiersTable.php +++ b/app/src/Model/Table/IdentifiersTable.php @@ -41,11 +41,8 @@ class IdentifiersTable extends Table { use \App\Lib\Traits\ChangelogBehaviorTrait; use \App\Lib\Traits\CoLinkTrait; use \App\Lib\Traits\HistoryTrait; -<<<<<<< HEAD use \App\Lib\Traits\LabeledLogTrait; -======= use \App\Lib\Traits\LayoutTrait; ->>>>>>> 63c59680 (Render Enrollment Attributes edit/add/view in a modal) use \App\Lib\Traits\PermissionsTrait; use \App\Lib\Traits\PrimaryLinkTrait; use \App\Lib\Traits\ProvisionableTrait;