[webkit-changes] cvs commit: LayoutTests ChangeLog

[Anders]

andersca    06/01/06 02:47:09

  Modified:    .        ChangeLog
  Log:
  Remove conflict marker
  
  Revision  Changes    Path
  1.229     +0 -1      LayoutTests/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/LayoutTests/ChangeLog,v
  retrieving revision 1.228
  retrieving revision 1.229
  diff -u -r1.228 -r1.229
  --- ChangeLog	6 Jan 2006 10:44:16 -0000	1.228
  +++ ChangeLog	6 Jan 2006 10:47:08 -0000	1.229
  @@ -502,7 +502,6 @@
           * css2.1/t1605-c545-txttrans-00-b-ag.html:
           * css2.1/t1606-c562-white-sp-00-b-ag.html:
   
  ->>>>>>> 1.227
   2006-01-04  Darin Adler  <darin at apple.com>
   
           - added a missing test result