Skip to content

Next forward master#428

Merged
skinkie merged 10 commits intonextfrom
next_forward_master
Feb 22, 2023
Merged

Next forward master#428
skinkie merged 10 commits intonextfrom
next_forward_master

Conversation

@skinkie
Copy link
Copy Markdown
Contributor

@skinkie skinkie commented Feb 22, 2023

Only apply after #427

# Conflicts:
#	xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd
#	xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd
#	xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_version.xsd
#	xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd
#	xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd
#	xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_version.xsd
#	xsd/netex_part_3/part3_fares/netex_usageParameterTravel_support.xsd
#	xsd/netex_part_3/part3_fares/netex_usageParameterTravel_version.xsd
#	xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_version.xsd
#	xsd/netex_service/netex_all_filters.xsd
@skinkie skinkie changed the base branch from master to next February 22, 2023 14:46
@skinkie skinkie merged commit 6047d63 into next Feb 22, 2023
@skinkie skinkie deleted the next_forward_master branch November 19, 2024 10:26
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.

1 participant