shown in the file to resolve the conflict, so if you're already familiar
with that there's no new commit marker syntax to learn.
-### [[• Get_CAll_@_1*855.709~2847_@_E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r]], editing pages in a web browser
+### [[Json.tl.ph]], editing pages in a web browser
Nearly the definition of a wiki, although perhaps ikiwiki challenges how
much of that web gunk a wiki really needs. These features are optional