diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-12-29 01:38:26 +0100 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2017-01-04 22:10:14 +0100 |
| commit | 203860ac23b6229096c0e9d9c04f12cd607c1938 (patch) | |
| tree | 43cdba091ef2ea2421a0633b4241e40135ec551a /.gitignore | |
| parent | 19014deb841f25d14827147d4812b1ddcce2b693 (diff) | |
| parent | ddebfa65f2bdff332902adf73606bc050014b498 (diff) | |
Merge remote-tracking branch 'google/master' into bazel-take-2
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index febcaf7942..3112445176 100644 --- a/.gitignore +++ b/.gitignore @@ -17,7 +17,7 @@ py27/ py34/ # Node installation output -^node_modules +node_modules src/node/extension_binary/ # gcov coverage data @@ -96,7 +96,7 @@ DerivedData Pods/ # Artifacts directory -artifacts/ +/artifacts/ # Git generated files for conflicting *.orig |