fixup merge conflict markers

This commit is contained in:
BigEd 2010-12-23 19:15:30 +00:00
parent 94e22becb4
commit e25ac6243c

View File

@ -1,6 +1,6 @@
<!DOCTYPE html>
<<<<<<< HEAD:expert.html
<title>Visual 6502 in JavaScript</title>
<style type="text/css">
@ -366,16 +366,5 @@ click here and type if your program handles input
</div> <!-- closing rightcolumn -->
</div> <!-- closing 'frame' div -->
Ed's github page for visual6502 project - if this is empty, there's no
preview from Ed. Refer instead to the upstream preview at
<a href=""></a>
or the staging version of the live site at
<a href=""></a>
or, of course, the live site itself at
<a href=""></a>
>>>>>>> 8f2e296ef69e46c27a602063b3a342ee30e8abee:expert.html