6502
/
visual6502
mirror of https://github.com/trebonian/visual6502.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixup merge conflict markers

This commit is contained in:
BigEd 2010-12-23 19:15:30 +00:00
parent 94e22becb4
commit e25ac6243c
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
expert.html
View File

@ -1,6 +1,6 @@
<html>
<!DOCTYPE html>
<head>
<<<<<<< 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>
</div> <!-- closing rightcolumn -->
</div> <!-- closing 'frame' div -->
=======
</head>
<body>
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="http://trebonian.github.com/visual6502">http://trebonian.github.com/visual6502</a>
or the staging version of the live site at
<a href="http://visual6502.org/stage/JSSim">http://visual6502.org/stage/JSSim</a>
or, of course, the live site itself at
<a href="http://visual6502.org/JSSim">http://visual6502.org/JSSim</a>
>>>>>>> 8f2e296ef69e46c27a602063b3a342ee30e8abee:expert.html
</body>
</html>