Fixing merging conflicts with "image-sync" branch.
This commit is contained in:
parent
fe1a716173
commit
7ecd7e53ef
@ -1,9 +1,9 @@
|
|||||||
converting
|
converting
|
||||||
abilitiesAsWikiText
|
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>'.
|
||||||
|
@ -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
|
|
Loading…
Reference in New Issue
Block a user