[llvm-commits] [release_18] CVS: llvm/docs/GettingStarted.html

[Reid Spencer]

Changes in directory llvm/docs:

GettingStarted.html updated: 1.136.2.3 -> 1.136.2.4
---
Log message:

Whoops .. don't commit merge conflict markers.


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

 GettingStarted.html |    6 +-----
 1 files changed, 1 insertion(+), 5 deletions(-)


Index: llvm/docs/GettingStarted.html
diff -u llvm/docs/GettingStarted.html:1.136.2.3 llvm/docs/GettingStarted.html:1.136.2.4
--- llvm/docs/GettingStarted.html:1.136.2.3	Thu Jul 27 01:44:27 2006
+++ llvm/docs/GettingStarted.html	Thu Jul 27 01:50:11 2006
@@ -1599,11 +1599,7 @@
   <a href="mailto:sabre at nondot.org">Chris Lattner</a><br>
   <a href="http://llvm.x10sys.com/rspencer/">Reid Spencer</a><br>
   <a href="http://llvm.org">The LLVM Compiler Infrastructure</a><br>
-<<<<<<< GettingStarted.html
-  Last modified: $Date: 2006/07/27 06:44:27 $
-=======
-  Last modified: $Date: 2006/07/27 06:44:27 $
->>>>>>> 1.139
+  Last modified: $Date: 2006/07/27 06:50:11 $
 </address>
 </body>
 </html>