Changeset 2152 for FCKeditor.Java/trunk

Show
Ignore:
Timestamp:
2008-07-03 00:27:05 (6 months ago)
Author:
mosipov
Message:

Corrections

Location:
FCKeditor.Java/trunk
Files:
2 added
1 modified

Legend:

Unmodified
Added
Removed

  • FCKeditor.Java/trunk/src/site/apt/velocity_freemarker.apt

    r2151 r2152  
    1919~~ @version $Id: connector.apt 2004 2008-05-16 14:48:17Z mosipov $ 
    2020                        ------------------------------ 
    21                            Velocity / Freemarker 
     21                        Velocity/FreeMarker Integration 
    2222                        ------------------------------ 
    2323                         
    … …  
    6868   <input type="submit" value="OK" /> 
    6969</form> 
    70 <<<<<<< .mine 
    71 <<<<<<< .mine 
    7270+------------------------------------------------------------------------------+ 
    73 ======= 
    74 +------------------------------------------------------------------------------+ 
    75 >>>>>>> .theirs 
    76 ======= 
    77 +------------------------------------------------------------------------------+ 
    78  
    79  
    80  
    81  
    82 >>>>>>> .theirs