Offray/RoloLudo
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Fixing merging problems.

Browse Source
This commit is contained in:
Offray Vladimir Luna Cárdenas 2021-06-20 14:11:41 -05:00
commit f47058404b
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RoloLudo.package/SfAsset.class/instance/abilitiesAsWikiText.st
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>'.

4
RoloLudo.package/SfAsset.class/instance/asJsonTiddler.st
View File

@ -1,3 +1,7 @@
accessing accessing
asJsonTiddler asJsonTiddler
<<<<<<< HEAD
^ self asTiddler asJson ^ self asTiddler asJson
=======
^ self asTiddler asJson
>>>>>>> master