"MDL-14412, fix cvs conflict mark"

diff --git a/filter/mediaplugin/filter.php b/filter/mediaplugin/filter.php
index b673303bca3c7a64812c851de640a399d2a37631..d796b1d6a8348b9612290bbc81f68e69189775b0 100644 (file)
--- a/filter/mediaplugin/filter.php
+++ b/filter/mediaplugin/filter.php
@@ -1,4 +1,3 @@
-<<<<<<< filter.php
 <?php // $Id$
 //////////////////////////////////////////////////////////////
 //  Media plugin filtering