Fixed missing string MDL-12801

diff --git a/lang/en_utf8/role.php b/lang/en_utf8/role.php
index 914701079ad5aed9f7038ff89fa06946dc9e73db..e056b025bf9709942768f53db877dae9a3746c1f 100644 (file)
--- a/lang/en_utf8/role.php
+++ b/lang/en_utf8/role.php
@@ -74,12 +74,8 @@ $string['errorbadroleshortname'] = 'Incorrect role name';
 $string['errorexistsrolename'] = 'Role name already exists';
 $string['errorexistsroleshortname'] = 'Role name already exists';
 $string['existingusers'] = '$a existing users';
-<<<<<<< role.php
-$string['globalrole'] = 'Global role';
-$string['globalroleswarning'] = 'WARNING! Any roles you assign from this page will apply to the assigned users throughout the entire site, including the front page and all the courses.';
-=======
+$string['globalrole'] = 'System role';
 $string['globalroleswarning'] = 'WARNING! Any roles you assign from this page will apply to the assigned users throughout the entire system, including the front page and all the courses.';
->>>>>>> 1.23.2.11
 $string['inherit'] = 'Inherit';
 $string['legacy:admin'] = 'LEGACY ROLE: Administrator';
 $string['legacy:coursecreator'] = 'LEGACY ROLE: Course Creator';