clean merge scabs

ry · ry · commit 610436f242c9 · 2011-08-06T03:46:41.000-07:00
diff --git a/deps/http_parser/http_parser.gyp b/deps/http_parser/http_parser.gyp
@@ -26,7 +26,6 @@
       },
       'defines': [ 'HTTP_PARSER_STRICT=0' ],
       'sources': [ './http_parser.c', ],
-<<<<<<< HEAD
       'conditions': [
         ['OS=="win"', {
           'msvs_settings': {
@@ -38,8 +37,6 @@
           },
         }]
       ],
-=======
->>>>>>> WIP
     },
 
     {
