Changeset 213732 in webkit


Ignore:
Timestamp:
Mar 10, 2017 3:47:42 PM (7 years ago)
Author:
msaboff@apple.com
Message:

Cleaned up merge markers inadvertently left in the file.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r213728 r213732  
    323323        (WebKit::WebProcess::initializeWebProcess):
    324324
    325 <<<<<<< .mine
    3263252017-03-09  Michael Saboff  <msaboff@apple.com>
    327326
    … …  
    372371        (WebKit::WebProcess::platformInitializeWebProcess):
    373372
    374 ||||||| .r213687
    375 =======
    3763732017-03-09  John Wilander  <wilander@apple.com>
    377374
    … …  
    405402            statistics.
    406403
    407 >>>>>>> .r213688
    4084042017-03-09  Brady Eidson  <beidson@apple.com>
    409405
Note: See TracChangeset for help on using the changeset viewer.