From 70f2169249b07fd7afcb7444233521c787f93e89 Mon Sep 17 00:00:00 2001
From: Lukas Rytz <lukas.rytz@gmail.com>
Date: Fri, 1 May 2015 19:52:33 +0200
Subject: Update intellij project files for IDEA 14.1 and latest Scala plugin

Removes the src/intellij-14 folder and moves everything back to
src/intellij.
---
 src/intellij/forkjoin.iml.SAMPLE | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/intellij/forkjoin.iml.SAMPLE')

diff --git a/src/intellij/forkjoin.iml.SAMPLE b/src/intellij/forkjoin.iml.SAMPLE
index be807cc019..42507b2911 100644
--- a/src/intellij/forkjoin.iml.SAMPLE
+++ b/src/intellij/forkjoin.iml.SAMPLE
@@ -8,5 +8,4 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
-- 
cgit v1.2.3