Fix conflict that I missed in the list commit.

llvm-svn: 18716

Author: John Criswell

llvm/docs/LangRef.html

@@ -895,24 +895,13 @@ <h5>Examples:</h5>
 <!-- ======================================================================= -->
 <div class="doc_subsection"><a name="undefvalues">Undefined Values</a></div>
 <div class="doc_text">
-<<<<<<< LangRef.html
-
-<p>The string '<tt>undef</tt>' is recognized as a filler that has no specified
-value.  Undefined values may be of any type, and be used anywhere a constant
-is.</p>
-
-<p>Undefined values are used to indicate to the compiler that the program is
-well defined no matter what value is used, giving it more freedom.</p>
-
-=======
   <p>The string '<tt>undef</tt>' is recognized as a type-less constant that has 
   no specific value.  Undefined values may be of any type, and be used anywhere 
   a constant is permitted.</p>
 
   <p>Undefined values indicate to the compiler that the program is well defined
   no matter what value is used, giving the compiler more freedom to optimize.
   </p>
->>>>>>> 1.82
 </div>
 
 <!-- ======================================================================= -->