From: moodler <moodler>
Date: Wed, 9 Jan 2008 07:36:29 +0000 (+0000)
Subject: Fixed missing string   MDL-12801
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=a58ff1159b91d393bff479604a0e8d18afa7dfa5;p=moodle.git

Fixed missing string   MDL-12801
---

diff --git a/lang/en_utf8/role.php b/lang/en_utf8/role.php
index 914701079a..e056b025bf 100644
--- 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';