-
Notifications
You must be signed in to change notification settings - Fork 173
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix: Reverting wrong conflict resolving unit converter (#3452)
On merge to alpha, these changes from Adam were accidentally reverted, and now it's changed back.
- Loading branch information
1 parent
0920d7c
commit 7b8b378
Showing
1 changed file
with
14 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters