Synchronizing local changes after getting "Detached..." warning at Iceberg. #1

Merged
Offray merged 4 commits from image-sync into master 2021-06-20 19:14:35 +00:00
2 changed files with 8 additions and 4 deletions
Showing only changes of commit f47058404b - Show all commits

View File

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

View File

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