Commit 816d9ab0 authored by andersca's avatar andersca
Browse files

Remove conflict marker. Thanks Mitz!


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@15266 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 605dc0d2
......@@ -127,8 +127,6 @@
* WebKit.xcodeproj/project.pbxproj:
Link OpenGL and AGL.
=======
>>>>>>> .r15264
2006-07-09 Brady Eidson <beidson@apple.com>
Reviewed by Maciej
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment