diff options
author | Lukas Rytz <lukas.rytz@gmail.com> | 2014-09-02 16:42:22 +0200 |
---|---|---|
committer | Lukas Rytz <lukas.rytz@gmail.com> | 2014-09-02 16:42:22 +0200 |
commit | a08be99fd587f341b35e59603908376be45e153c (patch) | |
tree | 35df87d95d9431765143ee196bbf3c098723860b /test/files/run/t7747-repl.check | |
parent | ad930e663046bb9973b664e8cb92218a41313ab8 (diff) | |
parent | 47908f19e064151140e32819c2edd9e68b34dd0c (diff) | |
download | scala-a08be99fd587f341b35e59603908376be45e153c.tar.gz scala-a08be99fd587f341b35e59603908376be45e153c.tar.bz2 scala-a08be99fd587f341b35e59603908376be45e153c.zip |
Merge commit '47908f1' into merge/2.11-to-2.12-is-it-really-sept-2-already-where-was-summer
Conflicts:
src/library/scala/util/matching/Regex.scala
Diffstat (limited to 'test/files/run/t7747-repl.check')
-rw-r--r-- | test/files/run/t7747-repl.check | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/run/t7747-repl.check b/test/files/run/t7747-repl.check index ad924f482c..105b238d01 100644 --- a/test/files/run/t7747-repl.check +++ b/test/files/run/t7747-repl.check @@ -283,4 +283,4 @@ object $read extends $read { } res3: List[Product with Serializable] = List(BippyBups(), PuppyPups(), Bingo()) -scala> +scala> :quit |