jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-19 08:52:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix a merge conflict.

Browse source
This commit is contained in:
Lukas Brübach 2025-01-23 18:01:26 +01:00
parent dcf9d062e2
commit e679bb2e2f
1 changed files with 0 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cockatrice/src/client/ui/widgets/general/layout_containers/flow_widget.h
View file

@ -10,9 +10,6 @@
inline Q_LOGGING_CATEGORY(FlowWidgetLog, "flow_widget"); inline Q_LOGGING_CATEGORY(FlowWidgetLog, "flow_widget");
inline Q_LOGGING_CATEGORY(FlowWidgetSizeLog, "flow_widget.size"); 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 class FlowWidget final : public QWidget
{ {
Q_OBJECT Q_OBJECT