mirror of
https://github.com/Icinga/icingaweb2-module-director.git
synced 2025-07-27 07:44:05 +02:00
BranchMerger: remove obsolete method call
This commit is contained in:
parent
2d79281583
commit
30c6e50e33
@ -5,7 +5,6 @@ namespace Icinga\Module\Director\Db\Branch;
|
|||||||
use Icinga\Module\Director\Data\Db\DbObject;
|
use Icinga\Module\Director\Data\Db\DbObject;
|
||||||
use Icinga\Module\Director\Data\Db\DbObjectTypeRegistry;
|
use Icinga\Module\Director\Data\Db\DbObjectTypeRegistry;
|
||||||
use Icinga\Module\Director\Db;
|
use Icinga\Module\Director\Db;
|
||||||
use Icinga\Module\Director\Objects\IcingaObject;
|
|
||||||
use Ramsey\Uuid\UuidInterface;
|
use Ramsey\Uuid\UuidInterface;
|
||||||
|
|
||||||
class BranchMerger
|
class BranchMerger
|
||||||
@ -128,7 +127,6 @@ class BranchMerger
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if ($exists) {
|
if ($exists) {
|
||||||
$current = $class::requireWithUniqueId($uuid, $this->connection);
|
|
||||||
$activity->applyToDbObject($class::requireWithUniqueId($uuid, $this->connection))->store();
|
$activity->applyToDbObject($class::requireWithUniqueId($uuid, $this->connection))->store();
|
||||||
// TODO: you modified an object, and related properties have been changed in the meantime.
|
// TODO: you modified an object, and related properties have been changed in the meantime.
|
||||||
// We're able to detect this with the given data, and might want to offer a rebase.
|
// We're able to detect this with the given data, and might want to offer a rebase.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user