[webkit-changes] cvs commit: JavaScriptCore ChangeLog

[Anders]

andersca    05/12/22 13:09:02

  Modified:    .        ChangeLog
  Log:
  Remove conflict markers
  
  Revision  Changes    Path
  1.922     +0 -1      JavaScriptCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/JavaScriptCore/ChangeLog,v
  retrieving revision 1.921
  retrieving revision 1.922
  diff -u -r1.921 -r1.922
  --- ChangeLog	22 Dec 2005 21:07:35 -0000	1.921
  +++ ChangeLog	22 Dec 2005 21:08:59 -0000	1.922
  @@ -38,7 +38,6 @@
           Also remove unneeded const in raw pointer versions.
           (KXMLCore::operator!=): Ditto.
   
  ->>>>>>> 1.920
   2005-12-21  Timothy Hatcher  <timothy at apple.com>
   
           * JavaScriptCore.xcodeproj/project.pbxproj: