X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/b52915c178ae1242b1258b810134212c9e724e0a..7a12b550f4a8366c8ace2f9c55706aba7c4b17f7:/apps/api/handlers/library_handlers.py?ds=sidebyside

diff --git a/apps/api/handlers/library_handlers.py b/apps/api/handlers/library_handlers.py
old mode 100644
new mode 100755
index 942ea0e8..562ed1b3
--- a/apps/api/handlers/library_handlers.py
+++ b/apps/api/handlers/library_handlers.py
@@ -512,7 +512,7 @@ class MergeHandler(BaseHandler):
                     "message": "You must first update your branch to the latest version."
                 })
 
-            if base_doc.parentof(doc) or base_doc.has_parent_from(doc):
+            if not base_doc.would_share():
                 return response.SuccessAllOk().django_response({
                     "result": "no-op"
                 })