Fix merge error

django-cms · Mar 31, 2016 · 7142ba8 · 7142ba8
1 parent 36488bd
commit 7142ba8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cms/static/cms/js/modules/cms.plugins.js b/cms/static/cms/js/modules/cms.plugins.js
@@ -306,6 +306,8 @@ var CMS = window.CMS || {};
                     pasteItem.find('.cms-submenu-item-paste-tooltip-restricted').css('display', 'block');
                     return false;
                 }
+            } else {
+                return false;
             }
 
             return true;

diff --git a/cms/tests/test_plugins.py b/cms/tests/test_plugins.py
@@ -3,9 +3,7 @@
 import datetime
 import json
 import os
-from distutils.version import LooseVersion
 
-import django
 from django import http
 from django.conf import settings
 from django.conf.urls import url