Fixing loading problem.

2021-06-20 15:10:07 -05:00 · 2021-06-20 15:10:07 -05:00 · 9f8556bfa3
commit 9f8556bfa3
parent e3833e5ca1
1 changed files with 1 additions and 5 deletions
--- a/RoloLudo.package/SfAsset.class/instance/asJsonTiddler.st
+++ b/RoloLudo.package/SfAsset.class/instance/asJsonTiddler.st
@ -1,7 +1,3 @@
 accessing
 asJsonTiddler
-<<<<<<< HEAD
-	^ self asTiddler asJson
-=======
-	^ self asTiddler asJson 
->>>>>>> master
+	^ self asTiddler asJson