fix merge conflict

Signed-off-by: mkljczk <[email protected]>
mkljczk · Dec 12, 2024 · 0bf3e79 · 0bf3e79
1 parent b38501e
commit 0bf3e79
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/priv/static/schemas/litepub-0.1.jsonld b/priv/static/schemas/litepub-0.1.jsonld
@@ -44,7 +44,6 @@
             "formerRepresentations": "litepub:formerRepresentations",
             "sm": "http://smithereen.software/ns#",
             "nonAnonymous": "sm:nonAnonymous",
-<<<<<<< HEAD
             "votersCount": "toot:votersCount",
             "mz": "https://joinmobilizon.org/ns#",
             "joinMode": {
@@ -68,8 +67,6 @@
                 "@id": "schema:location",
                 "@type": "schema:Place"
             },
-=======
->>>>>>> bites-pleroma
             "Bite": "https://ns.mia.jetzt/as#Bite"
         }
     ]