From e679bb2e2ff4ef3f9f5f1e6498335234e8beeddc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= Date: Thu, 23 Jan 2025 18:01:26 +0100 Subject: [PATCH] Fix a merge conflict. --- .../client/ui/widgets/general/layout_containers/flow_widget.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/cockatrice/src/client/ui/widgets/general/layout_containers/flow_widget.h b/cockatrice/src/client/ui/widgets/general/layout_containers/flow_widget.h index 93a5410a6..baed97b8d 100644 --- a/cockatrice/src/client/ui/widgets/general/layout_containers/flow_widget.h +++ b/cockatrice/src/client/ui/widgets/general/layout_containers/flow_widget.h @@ -10,9 +10,6 @@ inline Q_LOGGING_CATEGORY(FlowWidgetLog, "flow_widget"); inline Q_LOGGING_CATEGORY(FlowWidgetSizeLog, "flow_widget.size"); -inline Q_LOGGING_CATEGORY(FlowWidgetLog, "flow_widget"); -inline Q_LOGGING_CATEGORY(FlowWidgetSizeLog, "flow_widget.size"); - class FlowWidget final : public QWidget { Q_OBJECT