diff options
| author | Levi Bostian <levi.bostian@banno.com> | 2013-11-25 09:42:37 -0600 |
|---|---|---|
| committer | Levi Bostian <levi.bostian@banno.com> | 2013-11-25 09:42:37 -0600 |
| commit | af6701904b459b16cf65709cd8c70fd2f5519457 (patch) | |
| tree | 68cb4bf9ead32686f492e68528e9f0761e41c500 /scala.html.markdown | |
| parent | df3cc00f5233dac96c0e063d87d3552f493e25f6 (diff) | |
| parent | d24c824d388669181eed99c3e94bb25c2914304a (diff) | |
Fix conflict bash.
Diffstat (limited to 'scala.html.markdown')
| -rw-r--r-- | scala.html.markdown | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scala.html.markdown b/scala.html.markdown index b1b3ecbf..03c1ea76 100644 --- a/scala.html.markdown +++ b/scala.html.markdown @@ -374,7 +374,7 @@ import scala.collection.immutable._ import scala.collection.immutable.{List, Map} // Rename an import using '=>' -import scala.collection.immutable{ List => ImmutableList } +import scala.collection.immutable.{ List => ImmutableList } // Import all classes, except some. The following excludes Map and Set: import scala.collection.immutable.{Map => _, Set => _, _} |