From b5ddd37f8a84395b039fcd68ff3abd4de9cac833 Mon Sep 17 00:00:00 2001
From: stronk7 <stronk7>
Date: Thu, 24 Mar 2005 20:07:54 +0000
Subject: [PATCH] Take out some characters doing strange things under 1.5
 (perhaps result of a conficting cvs merge ????)

---
 lang/ko_utf8/moodle.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lang/ko_utf8/moodle.php b/lang/ko_utf8/moodle.php
index 2233cad14ba..f239f063f95 100644
--- a/lang/ko_utf8/moodle.php
+++ b/lang/ko_utf8/moodle.php
@@ -1,4 +1,3 @@
-<<<<<<< moodle.php
 <?php // $Id$ 
       // moodle.php - created with Moodle 1.5 UNSTABLE DEVELOPMENT (2005031000)