From: defacer <defacer>
Date: Sat, 21 Aug 2004 13:28:46 +0000 (+0000)
Subject: julmis' last commit contained garbage from a CVS merge conflict he obviously had,
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=6a3c93f484e3e30f6c6d23f36bc7d205947e839e;p=moodle.git

julmis' last commit contained garbage from a CVS merge conflict he obviously had,
so I 'm removing them. Good thing they weren't mixed with deliberate changes!
---

diff --git a/mod/forum/mod.html b/mod/forum/mod.html
index a2c1789787..35217c4672 100644
--- a/mod/forum/mod.html
+++ b/mod/forum/mod.html
@@ -86,11 +86,7 @@
     </font>
     </td>
     <td>
-<<<<<<< mod.html
-        <!-- <textarea name="intro" rows=4 cols=50 wrap="virtual"><?php p($form->intro) ?></textarea> -->
-=======
         <?php print_textarea($usehtmleditor, 20, 50, 680, 400, "intro", $form->intro); ?>
->>>>>>> 1.33
     </td>
 </tr>