diff options
| author | Lukas Rytz <lukas.rytz@gmail.com> | 2016-03-21 11:54:44 +0100 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@gmail.com> | 2016-03-21 12:01:33 +0100 |
| commit | 4f7cf6084482171dcf7419b874843ee23b3b29c6 (patch) | |
| tree | 14668ffe0e9169551ac13be58290b6ff57e06b02 /.gitignore | |
| parent | 12bf411cebf9da6bfdb5436c3b2f02fef454c44d (diff) | |
| parent | 5f5cc186cbedff6dc55993cb3b0dcfe36038efa1 (diff) | |
| download | scala-4f7cf6084482171dcf7419b874843ee23b3b29c6.tar.gz scala-4f7cf6084482171dcf7419b874843ee23b3b29c6.tar.bz2 scala-4f7cf6084482171dcf7419b874843ee23b3b29c6.zip | |
Merge commit '5f5cc18' into merge-2.11-to-2.12-mar-21
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/ |