[llvm-commits] [release_14] CVS: llvm/docs/LangRef.html

[John Criswell]

Changes in directory llvm/docs:

LangRef.html updated: 1.77.2.5 -> 1.77.2.6
---
Log message:

Fix conflict that I missed in the list commit.


---
Diffs of the changes:  (+1 -12)

Index: llvm/docs/LangRef.html
diff -u llvm/docs/LangRef.html:1.77.2.5 llvm/docs/LangRef.html:1.77.2.6
--- llvm/docs/LangRef.html:1.77.2.5	Thu Dec  9 12:16:01 2004
+++ llvm/docs/LangRef.html	Thu Dec  9 13:34:42 2004
@@ -895,16 +895,6 @@
 <!-- ======================================================================= -->
 <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>
@@ -912,7 +902,6 @@
   <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>
 
 <!-- ======================================================================= -->
@@ -2925,7 +2914,7 @@
 
   <a href="mailto:sabre at nondot.org">Chris Lattner</a><br>
   <a href="http://llvm.cs.uiuc.edu">The LLVM Compiler Infrastructure</a><br>
-  Last modified: $Date: 2004/12/09 18:16:01 $
+  Last modified: $Date: 2004/12/09 19:34:42 $
 </address>
 </body>
 </html>