summaryrefslogtreecommitdiff
path: root/test/files/neg/t4134.scala
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2013-09-18 09:01:51 -0700
committerJason Zaugg <jzaugg@gmail.com>2013-09-18 09:01:51 -0700
commitc5fdc815c30f0565a80a3837f368717a4e81e04d (patch)
tree48d2fc9de28b359fa9ef479e78388b9778f4ef52 /test/files/neg/t4134.scala
parent42151a9980be37eae6e8fdf40330070361fd88fd (diff)
parentf4267ccd96a9143c910c66a5b0436aaa64b7c9dc (diff)
downloadscala-c5fdc815c30f0565a80a3837f368717a4e81e04d.tar.gz
scala-c5fdc815c30f0565a80a3837f368717a4e81e04d.tar.bz2
scala-c5fdc815c30f0565a80a3837f368717a4e81e04d.zip
Merge pull request #2961 from paulp/pr/whitespace
Cull extraneous whitespace.
Diffstat (limited to 'test/files/neg/t4134.scala')
-rw-r--r--test/files/neg/t4134.scala6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/files/neg/t4134.scala b/test/files/neg/t4134.scala
index 678e4806ef..18f813dd1d 100644
--- a/test/files/neg/t4134.scala
+++ b/test/files/neg/t4134.scala
@@ -3,16 +3,16 @@
trait T1 {
def f: String
-}
+}
trait T2 extends T1 {
abstract override def f: String = "goo"
def something = super.f // So the "abstract override" is needed
-}
+}
trait Q1 {
def f: String = "bippy"
-}
+}
//trait T3 extends Q1 with T2 {
trait T3 extends T2 with Q1 {