moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-11 03:46:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Oops - remove CVS conflict markers from several files

Browse source
This commit is contained in:
scop22 2005-03-25 06:28:13 +00:00
parent 44190c0c10
commit b5998f0f08
5 changed files with 0 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lang/ko/auth.php
View file

@ -83,12 +83,10 @@ $string['instructions'] = '
$string['md5'] = 'MD5 인증 ';
$string['plaintext'] = '단순 텍스트';
$string['showguestlogin'] = '로그인 페이지에서 손님 로그인 버튼을 보이거나 숨길 수 있습니다.';
<<<<<<< auth.php
$string['stdchangepassword'] = '비밀번호 페이지를 사용하기';
$string['thischarset'] = 'euc-kr';
$string['thisdirection'] = 'ltr';
$string['thislanguage'] = '&#54620;&#44397;&#50612;';
=======
$string['stdchangepassword'] = '비밀번호 페이지를 사용하기';
?>