From 023013abf904e16dcd6b8724370c2a342a9ac6b5 Mon Sep 17 00:00:00 2001
From: GreLI <grelimail@gmail.com>
Date: Sun, 14 Jul 2019 19:22:59 +0300
Subject: [PATCH] =?UTF-8?q?Use=20=E2=80=99force=E2=80=99=20option=20in=20?=
 =?UTF-8?q?=E2=80=98mergePaths=E2=80=99=20only=20for=20paths=20with=20same?=
 =?UTF-8?q?=20attributes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/mergePaths.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/mergePaths.js b/plugins/mergePaths.js
index 9d3c570d..6a18996b 100644
--- a/plugins/mergePaths.js
+++ b/plugins/mergePaths.js
@@ -58,7 +58,7 @@ exports.fn = function(item, params) {
                 prevPathJS = path2js(prevContentItem),
                 curPathJS = path2js(contentItem);
 
-            if (params.force || equalData && !intersects(prevPathJS, curPathJS)) {
+            if (equalData && (params.force || !intersects(prevPathJS, curPathJS))) {
                 js2path(prevContentItem, prevPathJS.concat(curPathJS), params);
                 return false;
             }