diff options
| author | Ryan Dahl <ry@tinyclouds.org> | 2011-08-06 03:46:41 -0700 |
|---|---|---|
| committer | Ryan Dahl <ry@tinyclouds.org> | 2011-08-06 03:46:41 -0700 |
| commit | 610436f242c930871929334692d727d7d634193e (patch) | |
| tree | 307df1e8e91512b523041cba0eb3b78cbb1fa948 /deps/http_parser | |
| parent | 88afc406caa64628a249d726659b3b054f8dc70d (diff) | |
| download | android-node-v8-610436f242c930871929334692d727d7d634193e.tar.gz android-node-v8-610436f242c930871929334692d727d7d634193e.tar.bz2 android-node-v8-610436f242c930871929334692d727d7d634193e.zip | |
clean merge scabs
Diffstat (limited to 'deps/http_parser')
| -rw-r--r-- | deps/http_parser/http_parser.gyp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/deps/http_parser/http_parser.gyp b/deps/http_parser/http_parser.gyp index 3c0fd24d0b..e9183b8d55 100644 --- 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 }, { |