crossley    2003/06/19 18:36:04

  Modified:    .        blocks.properties
  Log:
  Missing newline at eof caused cvs conflicts.
  
  Revision  Changes    Path
  1.15      +1 -1      cocoon-2.1/blocks.properties
  
  Index: blocks.properties
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/blocks.properties,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- blocks.properties 17 Jun 2003 01:12:42 -0000      1.14
  +++ blocks.properties 20 Jun 2003 01:36:04 -0000      1.15
  @@ -64,4 +64,4 @@
   #exclude.block.woody=true
   #exclude.block.qdox=true
   #exclude.block.stx=true
  -#exclude.block.linotype=true
  \ No newline at end of file
  +#exclude.block.linotype=true
  
  
  

Reply via email to