From 644ed7d6214217289daa4c6211ace9e72db37eb5 Mon Sep 17 00:00:00 2001
From: Alex <alex.roidl@gmx.de>
Date: Mon, 11 Jun 2018 14:03:34 +0200
Subject: [PATCH] fixed tabs after merge error

---
 app/templates/base.html  | 1 -
 app/templates/scape.html | 2 +-
 app/views.py             | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/app/templates/base.html b/app/templates/base.html
index 965bce3..f407b49 100755
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -14,7 +14,6 @@
       <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
     <![endif]-->
     <link rel="stylesheet" href="/static/css/style.css">
-    <link rel="stylesheet" href="/static/js/jquery-ui-1.12.1.custom/jquery-ui.css">
     <link rel="stylesheet" href="/static/js/jquery-ui-1.12.1.custom/jquery-ui.js">
     {% block css %} {% endblock%}
   </head>
diff --git a/app/templates/scape.html b/app/templates/scape.html
index 96848b2..3adea7a 100644
--- a/app/templates/scape.html
+++ b/app/templates/scape.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet" type="text/css" href="http://code.jquery.com/ui/1.9.2/themes/base/jquery-ui.css"/>
+
     <style>
     #scape_container {
        zoom: 1;
diff --git a/app/views.py b/app/views.py
index ba2ddd8..b8b4447 100755
--- a/app/views.py
+++ b/app/views.py
@@ -677,7 +677,7 @@ def import_csv():
                         year_published = int(row['year_published'])
                     else:
                         year_published = None;
-                    book = Book(row['title'], row['file'], cover, row['fileformat'], row['category'],year_published)
+                    book = Book(row['title'], row['file'], cover, row['fileformat'], row['category'],year_published, None, None, None, None, None, None)
                     book.scapeX = float(row['scapeX'])
                     book.scapeY = float(row['scapeY'])
 
