diff options
| author | Zachary Sloan | 2013-06-20 22:44:27 +0000 |
|---|---|---|
| committer | Zachary Sloan | 2013-06-20 22:44:27 +0000 |
| commit | 468ca599d1bd1f83db41181be31e8e8c2c3b575b (patch) | |
| tree | 2e5aaca86f7ec382758d32af7e7dff9509c52706 | |
| parent | 4ffee373494170e708678039dca132f1bd729ab1 (diff) | |
| parent | 9623dad9abe9c36e8d65d9e47ae77230ffa741d8 (diff) | |
| download | genenetwork2-468ca599d1bd1f83db41181be31e8e8c2c3b575b.tar.gz | |
Merge branch 'flask' of /home/sam/gene
Conflicts:
wqflask/wqflask/templates/index_page.html
| -rw-r--r-- | wqflask/wqflask/templates/index_page.html | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/wqflask/wqflask/templates/index_page.html b/wqflask/wqflask/templates/index_page.html index 7424801a..61e34eca 100644 --- a/wqflask/wqflask/templates/index_page.html +++ b/wqflask/wqflask/templates/index_page.html @@ -52,7 +52,6 @@ </fieldset> </form> </section> - <section id="search"> <div class="page-header"> <h1>Select and search</h1> |