Skip to content

Commit e119343

Browse files
committed
merge: sync dev into main
# Conflicts: # tests/test_driver_page.cpp
2 parents 50e739d + 5a99cce commit e119343

1 file changed

Lines changed: 0 additions & 1 deletion

File tree

tests/test_driver_page.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,5 +457,4 @@ int main(int argc, char **argv) {
457457
TestDriverPage testCase;
458458
return QTest::qExec(&testCase, argc, argv);
459459
}
460-
461460
#include "test_driver_page.moc"

0 commit comments

Comments
 (0)