Index: jrst/src/java/org/codelutin/jrst/HtmlGenerator.java
diff -u jrst/src/java/org/codelutin/jrst/HtmlGenerator.java:1.12 jrst/src/java/org/codelutin/jrst/HtmlGenerator.java:1.13
--- jrst/src/java/org/codelutin/jrst/HtmlGenerator.java:1.12	Thu Aug 12 20:02:00 2004
+++ jrst/src/java/org/codelutin/jrst/HtmlGenerator.java	Fri Sep 17 13:59:07 2004
@@ -23,10 +23,10 @@
  *
  * @author Benjamin Poussin <poussin@codelutin.com>
  * Copyright Code Lutin
- * @version $Revision: 1.12 $
+ * @version $Revision: 1.13 $
  *
- * Mise a jour: $Date: 2004/08/12 20:02:00 $
- * par : $Author: bucas $
+ * Mise a jour: $Date: 2004/09/17 13:59:07 $
+ * par : $Author: bpoussin $
  */
 
 package org.codelutin.jrst;
@@ -467,24 +467,6 @@
        return text.toLowerCase().trim().replace(' ','-');
    }
 
-<<<<<<< HtmlGenerator.java
-   /**
-    * Encode pour les expressions régulières
-    */
-   public String encodeSpecChar(String text) {
-       return text.replaceAll("\\(", "\\\\(").replaceAll("\\)","\\\\)").replaceAll("\\[","\\\\[").replaceAll("\\]","\\\\]");
-   }
-
-   /**
-   * Permet de convertir les caratere speciaux HTML du texte
-   */
-   protected String encode(String s){
-       s = s.replaceAll("<", "&lt;");
-       s = s.replaceAll(">", "&gt;");
-       return s;
-   }
-
-=======
    /**
     * Encode pour les expressions régulières
     */
@@ -502,7 +484,6 @@
        return s;
    }
 
->>>>>>> 1.11
    public String inlineMarkup(String text) {
        String before = "(^|[ '\"(\\[<])";
        String after = "([ '\".,:\\;!?)\\]}/\\>]|$)";