Title: [293145] branches/safari-613-branch/Source/WebKit/DerivedSources-output.xcfilelist
- Revision
- 293145
- Author
- [email protected]
- Date
- 2022-04-20 21:51:39 -0700 (Wed, 20 Apr 2022)
Log Message
Remove merge conflict marker.
Modified Paths
Diff
Modified: branches/safari-613-branch/Source/WebKit/DerivedSources-output.xcfilelist (293144 => 293145)
--- branches/safari-613-branch/Source/WebKit/DerivedSources-output.xcfilelist 2022-04-21 04:51:24 UTC (rev 293144)
+++ branches/safari-613-branch/Source/WebKit/DerivedSources-output.xcfilelist 2022-04-21 04:51:39 UTC (rev 293145)
@@ -625,4 +625,3 @@
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/com.apple.WebKit.WebContent.sb
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/com.apple.WebKit.plugin-common.sb
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/com.apple.WebProcess.sb
-<<<<<<< HEAD
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
