commit 903283289f76c53ea457d8b993b3f35dfac385db
author Jean-Baptiste Queru <jbq@google.com> Tue Apr 12 16:23:18 2011 -0700
committer Jean-Baptiste Queru <jbq@google.com> Tue Apr 12 16:23:18 2011 -0700
tree 7fe893645033839ea401f34c6e01ad3fd8ed0ef5
parent 21f54bf13529077971e89b21f1af88d3b7532b84

Cleanup leftover merge conflict

Change-Id: Ie76072a905a1ee5633ee179d27b2eee5a2554423

javadoc/javax/annotation/meta/Exclusive.html

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 @@
  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();

javadoc/javax/annotation/meta/Exhaustive.html

diff --git a/javadoc/javax/annotation/meta/Exhaustive.html b/javadoc/javax/annotation/meta/Exhaustive.html
index 1cdf1b4..e0feb16 100644
--- a/javadoc/javax/annotation/meta/Exhaustive.html
+++ b/javadoc/javax/annotation/meta/Exhaustive.html
@@ -102,20 +102,12 @@
  Applications of the type qualifier with different values are exclusive, and
  the enumeration is an exhaustive list of the possible values.
  
-<<<<<<< .mine
- For example, the following defines a type qualifier such that if you know
- a value is neither &amp;#064;Foo(Color.Red) or &amp;#064;Foo(Color.Blue), then the value must be
- &amp;#064;Foo(Color.Green). And if you know it is &amp;#064;Foo(Color.Green), you know it cannot
- be &amp;#064;Foo(Color.Red) or &amp;#064;Foo(Color.Blue)
-  
-=======
  For example, the following defines a type qualifier such that if you know a
  value is neither @Foo(Color.Red) or @Foo(Color.Blue),
  then the value must be @Foo(Color.Green). And if you know it is
  @Foo(Color.Green), you know it cannot be
  @Foo(Color.Red) or @Foo(Color.Blue)
  
->>>>>>> .r47
  <code>
  &#064;TypeQualifier  @interface Foo {
      enum Color {RED, BLUE, GREEN};