From 9f8556bfa36985b5b3d0a1d2714d7208e080e524 Mon Sep 17 00:00:00 2001
From: Offray Luna <offray.luna@mutabit.com>
Date: Sun, 20 Jun 2021 15:10:07 -0500
Subject: [PATCH] Fixing loading problem.

---
 RoloLudo.package/SfAsset.class/instance/asJsonTiddler.st | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/RoloLudo.package/SfAsset.class/instance/asJsonTiddler.st b/RoloLudo.package/SfAsset.class/instance/asJsonTiddler.st
index f6cbcd5..9fd3b78 100644
--- 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
\ No newline at end of file