Resolve merge conflicts

This commit is contained in:
Griatch 2020-07-18 15:56:47 +02:00
commit 862d2a5d06
9 changed files with 228 additions and 121 deletions

View file

@ -2025,8 +2025,8 @@ def display_len(target):
strip MXP patterns.
Args:
target (string): A string with potential MXP components
to search.
target (any): Something to measure the length of. If a string, it will be
measured keeping asian-character and MXP links in mind.
Return:
int: The visible width of the target.