Merge branch '3.0' into 3

silverstripe · Jan 8, 2025 · 8474c02 · 8474c02
2 parents be3cc75 + 628f947
commit 8474c02
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -23,8 +23,7 @@
         "php": "^8.3",
         "silverstripe/admin": "^3",
         "silverstripe/framework": "^6",
-        "silverstripe/versioned": "^3",
-        "silverstripe/vendor-plugin": "^2"
+        "silverstripe/versioned": "^3"
     },
     "require-dev": {
         "phpunit/phpunit": "^11.3",

diff --git a/src/Forms/DiffField.php b/src/Forms/DiffField.php
@@ -2,7 +2,6 @@
 
 namespace SilverStripe\VersionedAdmin\Forms;
 
-use SilverStripe\Dev\Deprecation;
 use SilverStripe\Forms\FormField;
 use SilverStripe\Forms\HTMLEditor\HTMLEditorField_Readonly;
 use SilverStripe\Forms\HTMLReadonlyField;