Skip to content

Commit

Permalink
Merge branch 'master' of github.com:encorelab/NEOplace
Browse files Browse the repository at this point in the history
  • Loading branch information
zuk committed May 25, 2012
2 parents 0a4f147 + ad896f6 commit 329683f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
3 changes: 1 addition & 2 deletions classroom/tablet/p-equationConsensus.html
Expand Up @@ -42,8 +42,7 @@ <h2>Finalize Equations</h2>
<div class="checklist">
<div data-role="fieldcontain">
<fieldset data-role="controlgroup" id="submittedEquations" class="consensus">
<!-- To be dynamically filled -->
<table />
<table><!-- To be dynamically replaced --></table>
</fieldset>
</div>
</div>
Expand Down
3 changes: 1 addition & 2 deletions classroom/tablet/p-principleConsensus.html
Expand Up @@ -42,8 +42,7 @@ <h2>Finalize Principles</h2>
<div class="checklist">
<div data-role="fieldcontain">
<fieldset data-role="controlgroup" id="peerTags" class="consensus">
<!-- To be dynamically filled -->
<table />
<table><!-- To be dynamically replaced --></table>
</fieldset>
</div>
</div>
Expand Down

0 comments on commit 329683f

Please sign in to comment.