mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-04-22 19:01:15 +00:00
Resolve merge issue
This commit is contained in:
parent
cdc2aa0a80
commit
5cbd666b29
1 changed files with 0 additions and 1 deletions
|
@ -14,7 +14,6 @@
|
|||
* Source/GSLayoutManager.m: In _generateGlyphsUpToGlyph:
|
||||
add code to break out of the loop
|
||||
if char_last is > glyphs->char_length
|
||||
>>>>>>> 5c7c12c77 (Add code to break out of the loop if char_last has exceeded the end of the existing set of characters)
|
||||
|
||||
2021-10-13 Gregory John Casamento <greg.casamento@gmail.com>
|
||||
|
||||
|
|
Loading…
Reference in a new issue