diff options
| author | Guillaume Martres <smarter@ubuntu.com> | 2016-10-17 16:31:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-17 16:31:19 +0200 |
| commit | b648d1d9d41b33212192fa94ce5ece56af7c47ea (patch) | |
| tree | c6550797a7556dd6e2df7d6651cddab2b6579a4c | |
| parent | 0fdd4e37ffca9b1da770ba348aece793c200f1ff (diff) | |
| parent | b652a6e0f8ae3e952816a0818c3689943ea6f8e8 (diff) | |
| download | dotty-b648d1d9d41b33212192fa94ce5ece56af7c47ea.tar.gz dotty-b648d1d9d41b33212192fa94ce5ece56af7c47ea.tar.bz2 dotty-b648d1d9d41b33212192fa94ce5ece56af7c47ea.zip | |
Merge pull request #1602 from ljdelight/ensimeWorking
Move 'sandbox/scalajs/hello.scala' to 'sandbox/scalajs/src/main/scala…
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | sandbox/scalajs/src/main/scala/hello.scala (renamed from sandbox/scalajs/hello.scala) | 0 |
2 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 416a12eff..a34babd4f 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,8 @@ project/boot/ project/plugins/project/ project/local-plugins.sbt .history +.ensime +.ensime_cache/ # Scala-IDE specific .scala_dependencies diff --git a/sandbox/scalajs/hello.scala b/sandbox/scalajs/src/main/scala/hello.scala index bd4aa8cc5..bd4aa8cc5 100644 --- a/sandbox/scalajs/hello.scala +++ b/sandbox/scalajs/src/main/scala/hello.scala |