From 392edc844b59e2e6201c028cdb9d22b7db1de173 Mon Sep 17 00:00:00 2001 From: Owen Williams Date: Mon, 16 Mar 2020 10:24:35 -0400 Subject: master sync: clang-format changed lines --- src/mixer/playermanager.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/mixer/playermanager.cpp') diff --git a/src/mixer/playermanager.cpp b/src/mixer/playermanager.cpp index a9a6b8b12c..43cd07ac14 100644 --- a/src/mixer/playermanager.cpp +++ b/src/mixer/playermanager.cpp @@ -5,9 +5,8 @@ #include #include "control/controlobject.h" -#include "control/controlobject.h" -#include "effects/effectsmanager.h" #include "effects/effectrack.h" +#include "effects/effectsmanager.h" #include "engine/channels/enginedeck.h" #include "engine/enginemaster.h" #include "library/library.h" @@ -17,15 +16,14 @@ #include "mixer/previewdeck.h" #include "mixer/sampler.h" #include "mixer/samplerbank.h" +#include "preferences/dialog/dlgprefdeck.h" #include "soundio/soundmanager.h" #include "track/track.h" #include "util/assert.h" #include "util/defs.h" #include "util/logger.h" -#include "util/stat.h" #include "util/sleepableqthread.h" -#include "preferences/dialog/dlgprefdeck.h" - +#include "util/stat.h" namespace { -- cgit v1.2.3