summaryrefslogtreecommitdiffstats
path: root/javadoc/javax/annotation/meta/Exclusive.html
diff options
context:
space:
mode:
Diffstat (limited to 'javadoc/javax/annotation/meta/Exclusive.html')
-rw-r--r--javadoc/javax/annotation/meta/Exclusive.html7
1 files changed, 0 insertions, 7 deletions
diff --git a/javadoc/javax/annotation/meta/Exclusive.html b/javadoc/javax/annotation/meta/Exclusive.html
index 042dc7e..653d25b 100644
--- a/javadoc/javax/annotation/meta/Exclusive.html
+++ b/javadoc/javax/annotation/meta/Exclusive.html
@@ -101,13 +101,6 @@ This annotation can be applied to the value() element of an annotation that
For example, the following defines a type qualifier such that if you know a
value is @Foo(1), then the value cannot be @Foo(2) or {@Foo(3).
-<<<<<<< .mine
- For example, the following defines a type qualifier such that if you know
- a value is &amp;#064;Foo(1), then the value cannot be &amp;#064;Foo(2)
- or {&amp;#064;Foo(3).
-
-=======
->>>>>>> .r47
<code>
&#064;TypeQualifier &#064;interface Foo {
&#064;Exclusive int value();