diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2015-05-13 08:48:23 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2015-05-13 08:48:23 +1000 |
| commit | a436e9064807d95d5aa9691aebefeccf448734bc (patch) | |
| tree | 9cd6198413ef8ea5e885559e4f3230373821c00c /src/intellij-14/test-junit.iml.SAMPLE | |
| parent | 0bcd0a40dcfda091bbb665b5f0879d9ce3384ab5 (diff) | |
| parent | d253702f9f23186cbf95f611c2fd1a2d08330ad6 (diff) | |
| download | scala-a436e9064807d95d5aa9691aebefeccf448734bc.tar.gz scala-a436e9064807d95d5aa9691aebefeccf448734bc.tar.bz2 scala-a436e9064807d95d5aa9691aebefeccf448734bc.zip | |
Merge pull request #4500 from lrytz/merge-2.11-may-12
Merge 2.11.x into 2.12.x [ci: last-only]
Diffstat (limited to 'src/intellij-14/test-junit.iml.SAMPLE')
| -rw-r--r-- | src/intellij-14/test-junit.iml.SAMPLE | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/src/intellij-14/test-junit.iml.SAMPLE b/src/intellij-14/test-junit.iml.SAMPLE deleted file mode 100644 index 0dd9044066..0000000000 --- a/src/intellij-14/test-junit.iml.SAMPLE +++ /dev/null @@ -1,21 +0,0 @@ -<?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$/../../test/junit"> - <sourceFolder url="file://$MODULE_DIR$/../../test/junit" isTestSource="true" /> - </content> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="library" name="junit" level="project" /> - <orderEntry type="library" name="scaladoc-deps" level="project" /> - <orderEntry type="module" module-name="asm" /> - <orderEntry type="module" module-name="compiler" /> - <orderEntry type="module" module-name="forkjoin" /> - <orderEntry type="module" module-name="library" /> - <orderEntry type="module" module-name="partest-extras" /> - <orderEntry type="module" module-name="reflect" /> - <orderEntry type="module" module-name="repl" /> - <orderEntry type="library" name="starr-no-deps" level="project" /> - </component> -</module>
\ No newline at end of file |