FEAT #7699 added new lang var

src/app/contact/controllers/ContactGroupController.php

@@ -72,11 +72,7 @@ class ContactGroupController
         $user = UserModel::getByUserId(['select' => ['id'], 'userId' => $GLOBALS['userId']]);
         $existingGroup = ContactGroupModel::get(['select' => [1], 'where' => ['label = ?', 'owner = ?'], 'data' => [$data['label'], $user['id']]]);
         if (!empty($existingGroup)) {
-<<<<<<< c775c2ab5ad5d20ed7714655e22355e405842786
             return $response->withStatus(400)->withJson(['errors' => _CONTACTS_GROUP_LABEL_EXISTS]);
-=======
-            return $response->withStatus(400)->withJson(['errors' => _CONTACT_GROUP_LABEL_ALREADY_EXISTS]);
->>>>>>> FEAT #7699 added new lang var
         }
 
         $data['public'] = $data['public'] ? 'true' : 'false';

src/core/lang/lang-en.php

@@ -34,13 +34,8 @@ define('_CONTACTS_GROUP_ADDED', 'Contacts group added');
 define('_CONTACTS_GROUP_UPDATED', 'Contacts group updated');
 define('_CONTACTS_GROUP_DELETED', 'Contacts group deleted');
 define('_CONTACTS_GROUP_LIST_ADDED', 'Add contacts for group');
-<<<<<<< c775c2ab5ad5d20ed7714655e22355e405842786
-define('_CONTACTS_GROUP_LIST_DELETED', 'Delete a contact for group');
-define('_CONTACTS_GROUP_LABEL_EXISTS', 'Group with this label already exists');
-=======
 define('_CONTACTS_GROUP_LIST_DELETED', 'Delete contacts for group');
 define('_CONTACT_GROUP_LABEL_ALREADY_EXISTS', 'Group with this label already exists');
->>>>>>> FEAT #7699 added new lang var
 define('_DELETE_NOTIFICATIONS', 'Notification deleted');
 define('_DEST_USER', 'Recipient');
 define('_DOCTYPE_FIRSTLEVEL_ADDED', 'Doctype first level added');

src/core/lang/lang-fr.php

@@ -34,13 +34,8 @@ define('_CONTACTS_GROUP_ADDED', 'Groupe de contacts ajouté');
 define('_CONTACTS_GROUP_UPDATED', 'Groupe de contacts modifié');
 define('_CONTACTS_GROUP_DELETED', 'Groupe de contacts supprimé');
 define('_CONTACTS_GROUP_LIST_ADDED', 'Ajout de contacts dans le groupe');
-<<<<<<< c775c2ab5ad5d20ed7714655e22355e405842786
-define('_CONTACTS_GROUP_LIST_DELETED', 'Suppression d\'un contact dans le groupe');
-define('_CONTACTS_GROUP_LABEL_EXISTS', 'Groupe de contacts avec le même label existe déjà');
-=======
 define('_CONTACTS_GROUP_LIST_DELETED', 'Suppression de contacts dans le groupe');
 define('_CONTACT_GROUP_LABEL_ALREADY_EXISTS', 'Un groupe avec ce libellé existe déjà');
->>>>>>> FEAT #7699 added new lang var
 define('_DELETE_NOTIFICATIONS', 'Notification supprimée');
 define('_DEST_USER', 'Destinataire');
 define('_DOCTYPE_FIRSTLEVEL_ADDED', 'Chemise ajoutée');