Skip to content

Commit

Permalink
undoing conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@mbernst
mbernst committed Dec 23, 2013
1 parent 6949951 commit 5db9ab3
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions static/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@

<body>
<!-- this is a comment in HTML -->
<h1>John Hennessy</h1> <!-- h1 through h5 are headers. The higher the number, the smaller the header -->
<h1>Michael Bernstein</h1> <!-- h1 through h5 are headers. The higher the number, the smaller the header -->
<h4>Project Portfolio</h4>

<!-- p means paragraph -->
<p>John Hennessy is the president of Stanford University and takes HCI classes in his spare time.</p>
<p>Michael is an assistant professor at Stanford University and director of the human-computer interaction group. He combines computation with crowds, designing systems that enable people to connect and coordinate online.</p>

<h4>Projects</h4>
<ol>
Expand Down

0 comments on commit 5db9ab3

Please sign in to comment.