Skip to content

fix: ODR violations due to multiple enums called Type#102

Merged
3 commits merged intonullobsi:mainfrom
maxmitti:fix/enum_odr_violations
Nov 21, 2025
Merged

fix: ODR violations due to multiple enums called Type#102
3 commits merged intonullobsi:mainfrom
maxmitti:fix/enum_odr_violations

Conversation

@maxmitti
Copy link
Contributor

There was still a conflict left between groupedview.cpp and remotedevicepropertieswidget.cpp

@maxmitti maxmitti force-pushed the fix/enum_odr_violations branch from 3c8cdaa to f99f6b0 Compare November 15, 2025 14:01
@nullobsi nullobsi changed the title Fix ODR violations due to multiple enums called Type fix: ODR violations due to multiple enums called Type Nov 19, 2025
@nullobsi nullobsi force-pushed the fix/enum_odr_violations branch from f99f6b0 to f2c217f Compare November 19, 2025 20:37
@nullobsi nullobsi closed this pull request by merging all changes into nullobsi:main in a2e241f Nov 21, 2025
@maxmitti maxmitti deleted the fix/enum_odr_violations branch December 2, 2025 19:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants