Skip to content

Editorial conflicts resolution#669

Merged
leobalter merged 1 commit intomasterfrom
602-conflict
Mar 28, 2022
Merged

Editorial conflicts resolution#669
leobalter merged 1 commit intomasterfrom
602-conflict

Conversation

@leobalter
Copy link
Member

Closes #602

commit f18b054
Merge: 0836725 233d29c
Author: Leo Balter leonardo.balter@gmail.com
Date: Mon Mar 28 01:48:44 2022 -0700

Merge branch 'master' into 2021-08-cleanup-InitializeDateTimeFormat

commit 0836725
Author: Richard Gibson richard.gibson@gmail.com
Date: Tue Aug 17 18:55:23 2021 -0400

Editorial: Simplify {date,time}Style vs. explicit component checking

commit a1f6ff3
Author: Richard Gibson richard.gibson@gmail.com
Date: Tue Aug 17 18:46:55 2021 -0400

Editorial: Update InitializeDateTimeFormat to use more standard conventions

@leobalter
Copy link
Member Author

Somehow resolving the conflict from GitHub UI made it impossible to merge from the UI. This PR has a squashed commit representing the contents of #602 with references.

I cloned the commit message and authorship from a1f6ff3.

@leobalter leobalter merged commit 4cf1d2c into master Mar 28, 2022
@leobalter leobalter deleted the 602-conflict branch March 28, 2022 09:02
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