Fix leftover conflict marker in UPGRADE-3.0.md
This commit is contained in:
parent
28500db930
commit
b47220aaa4
@ -403,7 +403,6 @@ UPGRADE FROM 2.x to 3.0
|
|||||||
|
|
||||||
* The `choice_list` option of `ChoiceType` was removed.
|
* The `choice_list` option of `ChoiceType` was removed.
|
||||||
|
|
||||||
>>>>>>> 2.8
|
|
||||||
* The option "precision" was renamed to "scale".
|
* The option "precision" was renamed to "scale".
|
||||||
|
|
||||||
Before:
|
Before:
|
||||||
|
Reference in New Issue
Block a user