Merge branch '6.0' into 6

silverstripe · Jan 8, 2025 · 8a4273c · 8a4273c
2 parents e96a15f + 5c29dbc
commit 8a4273c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -24,8 +24,7 @@
         "silverstripe/admin": "^3",
         "silverstripe/versioned": "^3",
         "silverstripe/versioned-admin": "^3",
-        "symbiote/silverstripe-gridfieldextensions": "^5",
-        "silverstripe/vendor-plugin": "^2"
+        "symbiote/silverstripe-gridfieldextensions": "^5"
     },
     "require-dev": {
         "silverstripe/documentation-lint": "^1",

diff --git a/src/Models/BaseElement.php b/src/Models/BaseElement.php
@@ -33,7 +33,6 @@
 use SilverStripe\ORM\CMSPreviewable;
 use SilverStripe\Core\Config\Config;
 use SilverStripe\Core\Validation\ValidationResult;
-use SilverStripe\Dev\Deprecation;
 
 /**
  * Class BaseElement