fix: conflicts

2023-02-13 13:22:53 +01:00 · 2023-02-13 13:22:53 +01:00 · 65df9b87e7
parent ebee9144b4
commit 65df9b87e7
2 changed files with 3 additions and 3 deletions
--- a/front/salix/components/recover-password/index.html
+++ b/front/salix/components/recover-password/index.html
@ -1,7 +1,7 @@
 <h5 class="vn-mb-md vn-mt-lg" translate>Recover password</h5>
 <vn-textfield
-    label="Recovery email"
-    ng-model="$ctrl.email"
+    label="User or recovery email"
+    ng-model="$ctrl.user"
    vn-focus>
 </vn-textfield>
 <div
--- a/front/salix/components/recover-password/locale/es.yml
+++ b/front/salix/components/recover-password/locale/es.yml
@ -1,4 +1,4 @@
 Recover password: Recuperar contraseña
 We will sent you an email to recover your password: Te enviaremos un correo para restablecer tu contraseña
 Notification sent!: ¡Notificación enviada!
-Recovery email: Correo de recuperación
+User or recovery email: Usuario o correo de recuperación