Skip to content

Commit 4c0ea8a

Browse files
committed
fixup! fixup! feat: Add repair step for deduplicating mounts
1 parent 0294e5d commit 4c0ea8a

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

lib/private/Repair.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,7 @@
1919
use OC\Repair\ClearFrontendCaches;
2020
use OC\Repair\ClearGeneratedAvatarCache;
2121
use OC\Repair\Collation;
22-
<<<<<<< HEAD
2322
use OC\Repair\ConfigKeyMigration;
24-
use OC\Repair\DeduplicateMounts;
25-
=======
26-
>>>>>>> 40ad8fd0dfc (fixup! feat: Add repair step for deduplicating mounts)
2723
use OC\Repair\Events\RepairAdvanceEvent;
2824
use OC\Repair\Events\RepairErrorEvent;
2925
use OC\Repair\Events\RepairFinishEvent;

0 commit comments

Comments
 (0)