Changeset 49325 in webkit for trunk/JavaScriptCore

Timestamp:

Oct 8, 2009, 3:08:52 PM (16 years ago)

Author:

[email protected]

Message:

Removed some conflict markers from the ChangeLog

File:

• trunk/JavaScriptCore/ChangeLog (modified) (3 diffs)

trunk/JavaScriptCore/ChangeLog

@@ -36 +36 @@
         of testing for the cell tag with a 0 payload.
 
-<<<<<<< .mine
 2009-10-08  Geoffrey Garen  <[email protected]>
 
@@ -71 +70 @@
         the other way around.
 
-=======
 2009-10-08  Zoltan Herczeg  <[email protected]>
 
@@ -84 +82 @@
         (JSC::JIT::compileOpCall):
 
->>>>>>> .r49322
 2009-10-07  Geoffrey Garen  <[email protected]>