Fixing merging conflicts with "image-sync" branch.

This commit is contained in:
Offray Vladimir Luna Cárdenas 2021-06-20 13:51:05 -05:00
parent fe1a716173
commit 7ecd7e53ef
2 changed files with 3 additions and 15 deletions

View File

@ -3,7 +3,7 @@ abilitiesAsWikiText
| output | | output |
output := '' writeStream. output := '' writeStream.
output output
nextPutAll: '<ul style="list-style-type:none;">'; cr; nextPutAll: '<ul style="list-style-type:none;">'; lf;
nextPutAll: (self abilitiesAsWikiTextFor: self currentAbilities marked: '⬢'); nextPutAll: (self abilitiesAsWikiTextFor: self currentAbilities marked: '⬢');
nextPutAll: (self abilitiesAsWikiTextFor: self pendingAbilities marked: '⬡'); nextPutAll: (self abilitiesAsWikiTextFor: self pendingAbilities marked: '⬡');
nextPutAll: '</ul>'. nextPutAll: '</ul>'.

View File

@ -1,12 +0,0 @@
utilities
abilitiesAsWikiTextFor: abilitiesSubset
| aStream |
aStream := '' writeStream.
abilitiesSubset do: [:abi|
aStream
nextPutAll: ' <li> ⬢'; cr;
nextPutAll: ' ';
nextPutAll: abi; cr;
nextPutAll: ' </li>'; cr ].
^ aStream contents