diff options
author | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-06-08 11:14:36 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-06-08 11:14:36 +0200 |
commit | 2b5100db52c300ce7b336da6dae2008baad57358 (patch) | |
tree | bd56fb339921d458b71f320317b03a2318df272f /.gitignore | |
parent | 739833c51230d2bdb7699906b7acaa6a8bb76044 (diff) | |
parent | ab131f2a48628dd7ed86e112819860c67e8df75b (diff) |
Merge with master
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 7ad1a865a5e..6e7db58ea54 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ Testing /vespa-hadoop/dependency-reduced-pom.xml .preprocessed/ .DS_Store +install_manifest.txt |