diff options
Diffstat (limited to 'WebCore/WebCore.xcodeproj')
| -rw-r--r-- | WebCore/WebCore.xcodeproj/project.pbxproj | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj index 1a75733..5fa0e31 100644 --- a/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/WebCore/WebCore.xcodeproj/project.pbxproj @@ -18529,13 +18529,10 @@ B71FE6DF11091CB300DAEF77 /* PrintContext.h in Headers */, 9F72304F11184B4100AD0126 /* ScriptProfile.h in Headers */, 9F72305111184B4100AD0126 /* ScriptProfiler.h in Headers */, -<<<<<<< HEAD 59FD5B8D1129B29F00DB6D96 /* GeolocationPositionCache.h in Headers */, -======= BCE789161120D6080060ECE5 /* InlineIterator.h in Headers */, BCE789861120E7A60060ECE5 /* BidiRun.h in Headers */, 9F6FC1971122E82A00E80196 /* ScriptDebugServer.h in Headers */, ->>>>>>> webkit.org at r54731 ); runOnlyForDeploymentPostprocessing = 0; }; @@ -20714,13 +20711,10 @@ 84D0C4041115F1D40018AA34 /* AffineTransform.cpp in Sources */, B776D43D1104527500BEB0EC /* PrintContext.cpp in Sources */, 9F72305011184B4100AD0126 /* ScriptProfiler.cpp in Sources */, -<<<<<<< HEAD 59FD5B8B1129B29100DB6D96 /* GeolocationPositionCache.cpp in Sources */, -======= BCE7898B1120E8020060ECE5 /* BidiRun.cpp in Sources */, 9F6FC1961122E82A00E80196 /* ScriptDebugServer.cpp in Sources */, 76FF17E311235673001D61B5 /* PluginViewNone.cpp in Sources */, ->>>>>>> webkit.org at r54731 ); runOnlyForDeploymentPostprocessing = 0; }; |