diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2016-03-23 14:41:28 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2016-03-23 14:41:28 -0700 |
| commit | 6173274e2731a69a92b2371662959eaf89dd6836 (patch) | |
| tree | a9814b6d600559e584673cc46a55ab6277107208 /.gitignore | |
| parent | 5574c7278e4b6687ed61aa62c1694a1adda1ab24 (diff) | |
| parent | 845c4417510d7f19588e584db879c1099d3de1c3 (diff) | |
| download | scala-6173274e2731a69a92b2371662959eaf89dd6836.tar.gz scala-6173274e2731a69a92b2371662959eaf89dd6836.tar.bz2 scala-6173274e2731a69a92b2371662959eaf89dd6836.zip | |
Merge pull request #5055 from lrytz/merge-2.11-to-2.12-mar-21
Merge 2.11 to 2.12
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 061cd274ac..0fff976e90 100644 --- a/.gitignore +++ b/.gitignore @@ -30,6 +30,7 @@ /jenkins.properties # target directories for ant build +/build /build/ /dists/ @@ -55,5 +56,6 @@ # Sbt's target directories /target/ /project/target/ -/project/project/target +/project/project/target/ +/project/project/project/target/ /build-sbt/ |