From 6d2b70c7508140e420332af251a5cb33b220b2d1 Mon Sep 17 00:00:00 2001 From: Samy Pesse Date: Tue, 25 Oct 2016 22:59:08 +0200 Subject: [PATCH] Fix merge in "docs/reference/models/transform.md" --- docs/reference/models/transform.md | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/reference/models/transform.md b/docs/reference/models/transform.md index c650fb8cd..82da92e8b 100644 --- a/docs/reference/models/transform.md +++ b/docs/reference/models/transform.md @@ -331,7 +331,6 @@ Unwrap all inner content of an [`Inline`](./inline.md) node that match `properti Unwrap all inner content of a [`Block`](./block.md) node that match `properties`. For convenience, you can pass a `type` string or `properties` object. ->>>>>>> slate/master ## Document Transforms ### `deleteBackwardAtRange`