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

Fix bad lang merge

Browse Source
This commit is contained in:
Daniel Hensby 2021-07-08 12:37:20 +01:00
parent df842f6d8e
commit 69b397f467
No known key found for this signature in database
GPG Key ID: D8DEBC4C8E7BC8B9
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lang/de_DE.yml
View File

@ -1,11 +1,4 @@
de_DE: de_DE:
<<<<<<< HEAD
SilverStripe\UserForms\Model\EditableTextField:
MINMAXLENGTHCHECK: 'Minimale Länge sollte kleiner als maximale Länge sein'
SilverStripe\UserForms\Model\EditableFileField:
SELECTUPLOADFOLDER: 'Ordner für den Upload auswählen'
=======
>>>>>>> 5.9
SilverStripe\UserForms: SilverStripe\UserForms:
ADDEMAILRECIPIENT: 'E-Mail-Empfänger hinzufügen' ADDEMAILRECIPIENT: 'E-Mail-Empfänger hinzufügen'
CLEARBUTTON: Löschen CLEARBUTTON: Löschen