tonyair/silverstripe-userforms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-userforms.git synced 2024-10-22 17:05:42 +02:00
Code Issues Projects Releases Wiki Activity

MNT Fix broken merged up (#1013)

Browse Source
This commit is contained in:
Maxime Rainville 2020-10-22 15:47:17 +13:00 committed by GitHub
parent 4eb0fe25b9
commit d2bf27c847
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
code/Model/EditableFormField/EditableFileField.php
View File

@ -6,12 +6,9 @@ use SilverStripe\Assets\File;
use SilverStripe\Assets\Folder; use SilverStripe\Assets\Folder;
use SilverStripe\Assets\Upload_Validator; use SilverStripe\Assets\Upload_Validator;
use SilverStripe\Core\Config\Config; use SilverStripe\Core\Config\Config;
<<<<<<< HEAD
use SilverStripe\Core\Convert; use SilverStripe\Core\Convert;
use SilverStripe\Forms\FieldList; use SilverStripe\Forms\FieldList;
=======
use SilverStripe\Core\Injector\Injector; use SilverStripe\Core\Injector\Injector;
>>>>>>> 5.5
use SilverStripe\Forms\FileField; use SilverStripe\Forms\FileField;
use SilverStripe\Forms\LiteralField; use SilverStripe\Forms\LiteralField;
use SilverStripe\Forms\NumericField; use SilverStripe\Forms\NumericField;