MNT Fix broken merged up (#1013)

2020-10-22 15:47:17 +13:00 · 2020-10-22 15:47:17 +13:00 · d2bf27c847
parent 4eb0fe25b9
commit d2bf27c847
1 changed files with 0 additions and 3 deletions
--- a/code/Model/EditableFormField/EditableFileField.php
+++ b/code/Model/EditableFormField/EditableFileField.php
@ -6,12 +6,9 @@ use SilverStripe\Assets\File;
 use SilverStripe\Assets\Folder;
 use SilverStripe\Assets\Upload_Validator;
 use SilverStripe\Core\Config\Config;
-<<<<<<< HEAD
 use SilverStripe\Core\Convert;
 use SilverStripe\Forms\FieldList;
-=======
 use SilverStripe\Core\Injector\Injector;
->>>>>>> 5.5
 use SilverStripe\Forms\FileField;
 use SilverStripe\Forms\LiteralField;
 use SilverStripe\Forms\NumericField;