Added entries in the bookshop database

340CT-1819SEPJAN · Oct 9, 2018 · 7a02982ab63660219d9d51908358169c8a4e0160 · 7a02982
1 parent 88db6a5
commit 7a02982ab63660219d9d51908358169c8a4e0160
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/exercises/01_nodejs/02_dynamic_website/bookshop/books.sql b/exercises/01_nodejs/02_dynamic_website/bookshop/books.sql
@@ -16,3 +16,15 @@ INSERT INTO books(title, isbn, description)
         book’s data modeling, query, and code examples, you’ll quickly be able to implement 
         your own solution."
     );
+    INSERT INTO books(title, isbn, description) 
+    VALUES(
+        "New Book 1", 
+        942323203223, 
+        "Test book"
+    );
+     INSERT INTO books(title, isbn, description) 
+    VALUES(
+        "New Book 2", 
+        540232932103, 
+        "Test book 2"
+    );
diff --git a/exercises/01_nodejs/02_dynamic_website/bookshop/bookshop.db b/exercises/01_nodejs/02_dynamic_website/bookshop/bookshop.db
diff --git a/exercises/01_nodejs/02_dynamic_website/bookshop/package.json b/exercises/01_nodejs/02_dynamic_website/bookshop/package.json
@@ -11,13 +11,7 @@
   "dependencies": {
     "express": "^4.16.3",
     "express-es6-template-engine": "^2.0.3",
-<<<<<<< HEAD:exercises/01_nodejs/01_templates_forms/repeating_data/package.json
     "express-handlebars": "latest",
-||||||| merged common ancestors
-    "express-handlebars": "^0.5.2",
-=======
-    "express-handlebars": "^3.0.0",
->>>>>>> 56dc4766e99a0418b49f15b56982df64b229bfaa:exercises/01_nodejs/02_dynamic_website/bookshop/package.json
     "sqlite3": "^4.0.2"
   },
   "devDependencies": {