diff options
| author | Lukas Rytz <lukas.rytz@typesafe.com> | 2016-03-23 16:36:38 +0100 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@typesafe.com> | 2016-03-23 16:36:38 +0100 |
| commit | 1fcfdd8c8bca1adba6eff2381ac6e765141801f0 (patch) | |
| tree | c94d7b1e1ab7b1fa78c53e21b834ab16788a4c5b /src/intellij/scala.iml.SAMPLE | |
| parent | 4ef14294453c43420e0e1a2ac984ba4a2d8b8dca (diff) | |
| parent | 2b3696ec4134f08ae37414f1406a87e746bc6128 (diff) | |
| download | scala-2.11.x.tar.gz scala-2.11.x.tar.bz2 scala-2.11.x.zip | |
Merge pull request #5054 from lrytz/intellij-2.112.11.x
Update IntelliJ build for use with sbt
Diffstat (limited to 'src/intellij/scala.iml.SAMPLE')
| -rw-r--r-- | src/intellij/scala.iml.SAMPLE | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/intellij/scala.iml.SAMPLE b/src/intellij/scala.iml.SAMPLE index 9e8718dd45..f1b2938016 100644 --- a/src/intellij/scala.iml.SAMPLE +++ b/src/intellij/scala.iml.SAMPLE @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <module type="JAVA_MODULE" version="4"> <component name="NewModuleRootManager" inherit-compiler-output="true"> - <exclude-output /> <content url="file://$MODULE_DIR$/../.."> <excludeFolder url="file://$MODULE_DIR$/../../build" /> + <excludeFolder url="file://$MODULE_DIR$/../../build-sbt" /> + <excludeFolder url="file://$MODULE_DIR$/../../target" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> |