diff options
| author | Steve Block <steveblock@google.com> | 2009-12-17 09:55:28 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-17 09:55:28 -0800 |
| commit | 4dd98cc27e25e6c3104672f50749132d2236461b (patch) | |
| tree | 01f4412526c81ec62e02d71d128ec45827a12fdc /WebCore/history/HistoryItem.cpp | |
| parent | fadf964da75468c2c995316cea8d82d32705a7e1 (diff) | |
| parent | aad6f24e036b3740071bb995b955b18b572067b2 (diff) | |
| download | external_webkit-4dd98cc27e25e6c3104672f50749132d2236461b.zip external_webkit-4dd98cc27e25e6c3104672f50749132d2236461b.tar.gz external_webkit-4dd98cc27e25e6c3104672f50749132d2236461b.tar.bz2 | |
am aad6f24e: Merge webkit.org at r51976 : Fix general conflicts.
Merge commit 'aad6f24e036b3740071bb995b955b18b572067b2' into eclair-mr2-plus-aosp
* commit 'aad6f24e036b3740071bb995b955b18b572067b2':
Merge webkit.org at r51976 : Fix general conflicts.
Diffstat (limited to 'WebCore/history/HistoryItem.cpp')
| -rw-r--r-- | WebCore/history/HistoryItem.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/WebCore/history/HistoryItem.cpp b/WebCore/history/HistoryItem.cpp index f6fbd59..21e67ca 100644 --- a/WebCore/history/HistoryItem.cpp +++ b/WebCore/history/HistoryItem.cpp @@ -393,8 +393,6 @@ void HistoryItem::setIsTargetItem(bool flag) #if PLATFORM(ANDROID) notifyHistoryItemChanged(this); #endif -<<<<<<< HEAD:WebCore/history/HistoryItem.cpp -======= } void HistoryItem::setStateObject(PassRefPtr<SerializedScriptValue> object) @@ -421,7 +419,6 @@ void HistoryItem::documentDetached(Document* document) ASSERT_UNUSED(document, m_document == document); m_document = 0; m_stateObject = 0; ->>>>>>> webkit.org at r51976:WebCore/history/HistoryItem.cpp } void HistoryItem::addChildItem(PassRefPtr<HistoryItem> child) |