diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-01-28 13:47:23 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-01-28 13:47:23 -0800 |
| commit | 7b5998a0592ee707c02a13859fe1520687c76c38 (patch) | |
| tree | 002c8eed76932dd300bfcaae303c8b1c4e5756d3 /src/intellij/scala-lang.ipr.SAMPLE | |
| parent | 20cb778085bdbc9dc48f59e3a1a1e7a5e3915107 (diff) | |
| parent | 80d56a40755e0806d33959ad991acb282cd0ba54 (diff) | |
| download | scala-7b5998a0592ee707c02a13859fe1520687c76c38.tar.gz scala-7b5998a0592ee707c02a13859fe1520687c76c38.tar.bz2 scala-7b5998a0592ee707c02a13859fe1520687c76c38.zip | |
Merge pull request #4271 from retronym/ticket/8642
SI-8642 Enable OSGi tests under Java 8
Diffstat (limited to 'src/intellij/scala-lang.ipr.SAMPLE')
| -rw-r--r-- | src/intellij/scala-lang.ipr.SAMPLE | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/intellij/scala-lang.ipr.SAMPLE b/src/intellij/scala-lang.ipr.SAMPLE index c0614c946c..0cd3fdae6a 100644 --- a/src/intellij/scala-lang.ipr.SAMPLE +++ b/src/intellij/scala-lang.ipr.SAMPLE @@ -218,6 +218,7 @@ <module fileurl="file://$PROJECT_DIR$/scalap.iml" filepath="$PROJECT_DIR$/scalap.iml" /> <module fileurl="file://$PROJECT_DIR$/test.iml" filepath="$PROJECT_DIR$/test.iml" /> <module fileurl="file://$PROJECT_DIR$/test-junit.iml" filepath="$PROJECT_DIR$/test-junit.iml" /> + <module fileurl="file://$PROJECT_DIR$/test-osgi.iml" filepath="$PROJECT_DIR$/test-osgi.iml" /> </modules> </component> <component name="ProjectResources"> |