Remove conflict marker. Thanks Mitz!

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@15266 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKit/ChangeLog

@@ -127,8 +127,6 @@
         * WebKit.xcodeproj/project.pbxproj:
         Link OpenGL and AGL.
 
-=======
->>>>>>> .r15264
 2006-07-09  Brady Eidson  <beidson@apple.com>
 
         Reviewed by Maciej