From e614d799916e8e8d8f4675a78c27fc142996ade3 Mon Sep 17 00:00:00 2001
From: dongsheng <dongsheng>
Date: Fri, 8 May 2009 08:36:34 +0000
Subject: [PATCH] "MDL-14412, fix cvs conflict mark"

---
 filter/mediaplugin/filter.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/filter/mediaplugin/filter.php b/filter/mediaplugin/filter.php
index b673303bca..d796b1d6a8 100644
--- a/filter/mediaplugin/filter.php
+++ b/filter/mediaplugin/filter.php
@@ -1,4 +1,3 @@
-<<<<<<< filter.php
 <?php // $Id$
 //////////////////////////////////////////////////////////////
 //  Media plugin filtering
-- 
2.39.5