clean merge scabs

13 years ago · 610436f242
1 changed files with 0 additions and 3 deletions
--- 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
    },

    {