diff --git a/bosm/__init__.py b/bosm/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/db.sqlite3 b/db.sqlite3 deleted file mode 100644 index 71a8671..0000000 Binary files a/db.sqlite3 and /dev/null differ diff --git a/static/js/script.js b/static/js/script.js index 31fa9eb..9d7440b 100644 --- a/static/js/script.js +++ b/static/js/script.js @@ -1,4 +1,8 @@ +<<<<<<< HEAD +av=[1,1,1,1,1] ; // availabilty of questions for each stadium 1:available 0:not available +======= av=[1,1,1,1,1] ; // availabilty of questions for each Arena 1:available 0:not available +>>>>>>> master left=[0.125,0.50,0.85]; // left constraint for popup visibility right=[0.16,0.57,0.92]; // right constraint for popup visibility // device detection diff --git a/static/main/style/newCss.css b/static/main/style/newCss.css index e3d683b..c0940dc 100644 --- a/static/main/style/newCss.css +++ b/static/main/style/newCss.css @@ -76,6 +76,11 @@ canvas{ display: block; vertical-align: bottom; opacity: 1} { display: none; } +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> master .rotate { display: none; @@ -105,3 +110,7 @@ canvas{ display: block; vertical-align: bottom; opacity: 1} font-size: 100px; } } +<<<<<<< HEAD +======= +>>>>>>> upstream/master +>>>>>>> master diff --git a/templates/front.html b/templates/front.html index 5ebcc7b..ccded2d 100644 --- a/templates/front.html +++ b/templates/front.html @@ -9,6 +9,45 @@ +<<<<<<< HEAD +======= +<<<<<<< HEAD + + +======= +>>>>>>> upstream/master +>>>>>>> master