aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--wqflask/wqflask/templates/search_result_page.html2
-rw-r--r--wqflask/wqflask/views.py3
2 files changed, 1 insertions, 4 deletions
diff --git a/wqflask/wqflask/templates/search_result_page.html b/wqflask/wqflask/templates/search_result_page.html
index 7d36d32e..0bcbd492 100644
--- a/wqflask/wqflask/templates/search_result_page.html
+++ b/wqflask/wqflask/templates/search_result_page.html
@@ -436,7 +436,7 @@
{% else %}
'sDom': "pitirp",
{% endif %}
- 'iDisplayLength': 10,
+ 'iDisplayLength': 100,
'deferRender': true,
'paging': true,
'orderClasses': true,
diff --git a/wqflask/wqflask/views.py b/wqflask/wqflask/views.py
index 2c1fa94b..2df7113e 100644
--- a/wqflask/wqflask/views.py
+++ b/wqflask/wqflask/views.py
@@ -27,9 +27,7 @@ import array
import sqlalchemy
from wqflask import app
from flask import g, Response, request, make_response, render_template, send_from_directory, jsonify, redirect, url_for, send_file
-<<<<<<< HEAD
-=======
from wqflask import group_manager
from wqflask import resource_manager
from wqflask import search_results
@@ -39,7 +37,6 @@ from wqflask import update_search_results
from wqflask import docs
from wqflask import news
from wqflask import server_side
->>>>>>> ed2afa4a (move SnpPage to a generic class ServerSide)
from wqflask.submit_bnw import get_bnw_input
from base.data_set import create_dataset, DataSet # Used by YAML in marker_regression
from wqflask.show_trait import show_trait