fix mis-merge
authorDavid Tardon <dtardon@redhat.com>
Tue, 23 Jun 2020 11:58:21 +0000 (13:58 +0200)
committerThe Plumber <50238977+systemd-rhel-bot@users.noreply.github.com>
Fri, 26 Jun 2020 10:25:18 +0000 (12:25 +0200)
commit8e1cc941607263a4f8454d0d6d5939aec3be1fcb
treed130789545e4a39ff04e6bd8929368d0e25602ec
parent762959047c1e1a5d4b6a6fe85cfa8a14c622e4da
fix mis-merge

Resolves: #1848421
src/core/cgroup.c