diff options
| author | Reid Spencer <rspencer@reidspencer.com> | 2006-07-27 06:50:11 +0000 |
|---|---|---|
| committer | Reid Spencer <rspencer@reidspencer.com> | 2006-07-27 06:50:11 +0000 |
| commit | 361e792078a7ec9ce4011030fb966079cfbd5645 (patch) | |
| tree | 4d3b87bf8713e163993226e440e300b4cf4689b8 | |
| parent | 14bd933716eb19e000a9420b352f26895c112114 (diff) | |
| download | llvm-361e792078a7ec9ce4011030fb966079cfbd5645.zip llvm-361e792078a7ec9ce4011030fb966079cfbd5645.tar.gz llvm-361e792078a7ec9ce4011030fb966079cfbd5645.tar.bz2 | |
Whoops .. don't commit merge conflict markers.
llvm-svn: 29341
| -rw-r--r-- | llvm/docs/GettingStarted.html | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/llvm/docs/GettingStarted.html b/llvm/docs/GettingStarted.html index d10dab5..c4a5043 100644 --- a/llvm/docs/GettingStarted.html +++ b/llvm/docs/GettingStarted.html @@ -1599,11 +1599,7 @@ out:</p> <a href="mailto:sabre@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$ -======= Last modified: $Date$ ->>>>>>> 1.139 </address> </body> </html> |