diff options
Diffstat (limited to 'WebCore/storage/SQLTransactionSyncCallback.h')
| -rw-r--r-- | WebCore/storage/SQLTransactionSyncCallback.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/WebCore/storage/SQLTransactionSyncCallback.h b/WebCore/storage/SQLTransactionSyncCallback.h index bd5b65c..eba82b0 100644 --- a/WebCore/storage/SQLTransactionSyncCallback.h +++ b/WebCore/storage/SQLTransactionSyncCallback.h @@ -31,10 +31,6 @@ #if ENABLE(DATABASE) -<<<<<<< HEAD -// ANDROID -======= ->>>>>>> webkit.org at r60469 #include <wtf/RefCounted.h> #include <wtf/Threading.h> |