summaryrefslogtreecommitdiff
path: root/src/reflect/scala/reflect/runtime/JavaUniverseForce.scala
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@gmail.com>2015-10-05 11:35:33 +0200
committerLukas Rytz <lukas.rytz@gmail.com>2015-10-05 11:35:33 +0200
commit5435d2b11e9d23c50c5448b7623712f6e647c315 (patch)
treeb1fc98841d6c26171221e66a5d659b39d856bf65 /src/reflect/scala/reflect/runtime/JavaUniverseForce.scala
parentc3906917675b54e9ac1f248c9fb0fba9fa310f0e (diff)
parentbb3ded3826adbb52b23725a93d6d51fc127b5623 (diff)
downloadscala-5435d2b11e9d23c50c5448b7623712f6e647c315.tar.gz
scala-5435d2b11e9d23c50c5448b7623712f6e647c315.tar.bz2
scala-5435d2b11e9d23c50c5448b7623712f6e647c315.zip
Merge commit 'bb3ded3' into merge-2.11-to-2.12-oct-5
Diffstat (limited to 'src/reflect/scala/reflect/runtime/JavaUniverseForce.scala')
-rw-r--r--src/reflect/scala/reflect/runtime/JavaUniverseForce.scala1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/reflect/scala/reflect/runtime/JavaUniverseForce.scala b/src/reflect/scala/reflect/runtime/JavaUniverseForce.scala
index 278d081249..1e9a4fe8a5 100644
--- a/src/reflect/scala/reflect/runtime/JavaUniverseForce.scala
+++ b/src/reflect/scala/reflect/runtime/JavaUniverseForce.scala
@@ -106,7 +106,6 @@ trait JavaUniverseForce { self: runtime.JavaUniverse =>
this.AnnotationInfo
this.Annotation
this.UnmappableAnnotation
- this.ErroneousAnnotation
this.ThrownException
this.typeNames
this.tpnme