merged properly with develop

cms/tests/__init__.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-<<<<<<< HEAD
+
 from cms.tests.admin import *
 from cms.tests.api import *
 from cms.tests.apphooks import *
@@ -27,47 +27,4 @@
 from cms.tests.toolbar import *
 from cms.tests.urlutils import *
 from cms.tests.views import *
-from cms.tests.management import *
-=======
-from cms.tests.admin import (AdminTestCase, AdminFieldsetTests, 
-    AdminListFilterTests, AdminTests, NoDBAdminTests, PluginPermissionTests)
-from cms.tests.api import PythonAPITests
-from cms.tests.apphooks import ApphooksTestCase
-from cms.tests.docs import DocsTestCase
-from cms.tests.forms import FormsTestCase
-from cms.tests.mail import MailTestCase
-from cms.tests.menu import (FixturesMenuTests, MenuTests, AdvancedSoftrootTests, 
-    ShowSubMenuCheck)
-from cms.tests.menu_utils import MenuUtilsTests
-from cms.tests.middleware import MiddlewareTestCase
-from cms.tests.multilingual import MultilingualTestCase
-from cms.tests.navextender import NavExtenderTestCase
-from cms.tests.nonroot import NonRootCase
-from cms.tests.page import PagesTestCase, NoAdminPageTests
-from cms.tests.permmod import PermissionModeratorTests, PatricksMoveTest
-from cms.tests.placeholder import (PlaceholderModelTests, PlaceholderAdminTest, 
-    PlaceholderTestCase, PlaceholderActionTests, PlaceholderPluginPermissionTests)
-from cms.tests.plugins import (PluginManyToManyTestCase, PluginsTestCase, 
-    SekizaiTests, LinkPluginTestCase)
-from cms.tests.po import PoTest
-from cms.tests.publisher import PublisherTestCase
-from cms.tests.rendering import RenderingTestCase
-from cms.tests.reversion_tests import ReversionTestCase
-from cms.tests.security import SecurityTests
-from cms.tests.settings import SettingsTests
-from cms.tests.site import SiteTestCase
-from cms.tests.templatetags import TemplatetagTests, TemplatetagDatabaseTests
-from cms.tests.toolbar import ToolbarTests
-from cms.tests.urlutils import UrlutilsTestCase
-from cms.tests.views import ViewTests
-from cms.tests.management import ManagementTestCase
-
-try:
-    from cms.tests.javascript import JavascriptTestCase
-except ImportError:
-    import warnings
-    import traceback
-    exc = traceback.format_exc()
-    warnings.warn("JavascriptTestCase cannot be run: %s" % exc)
->>>>>>> Made PageAdmin.add_plugin check add permissions for the actual plugin model
-
+from cms.tests.management import *