Resolve Conflict for merging

This commit is contained in:
Remy Boulanouar 2017-05-24 16:26:42 +02:00
parent 15d9e00533
commit 49e4008a40

View File

@ -1429,5 +1429,5 @@ error.not_signed_commit = "Not a signed commit"
error.failed_retrieval_gpg_keys = "Failed to retrieve any key attached to the committer account"
[units]
error.no_unit_allowed_repo = Cannot find any unit allowed on this repository
error.unit_not_allowed = You have not allowed to visit this repository unit
error.no_unit_allowed_repo = Cannot find any unit on this repository which you are allowed to access
error.unit_not_allowed = You are not allowed to visit this repository unit