Fixing loading problem.
This commit is contained in:
parent
e3833e5ca1
commit
9f8556bfa3
@ -1,7 +1,3 @@
|
|||||||
accessing
|
accessing
|
||||||
asJsonTiddler
|
asJsonTiddler
|
||||||
<<<<<<< HEAD
|
^ self asTiddler asJson
|
||||||
^ self asTiddler asJson
|
|
||||||
=======
|
|
||||||
^ self asTiddler asJson
|
|
||||||
>>>>>>> master
|
|
Loading…
Reference in New Issue
Block a user