From 7a02982ab63660219d9d51908358169c8a4e0160 Mon Sep 17 00:00:00 2001
From: mitroio <mitroio@uni.coventry.ac.uk>
Date: Tue, 9 Oct 2018 11:38:04 +0100
Subject: [PATCH] Added entries in the bookshop database

---
 .../02_dynamic_website/bookshop/books.sql     |  12 ++++++++++++
 .../02_dynamic_website/bookshop/bookshop.db   | Bin 24576 -> 28672 bytes
 .../02_dynamic_website/bookshop/package.json  |   6 ------
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/exercises/01_nodejs/02_dynamic_website/bookshop/books.sql b/exercises/01_nodejs/02_dynamic_website/bookshop/books.sql
index d1d74a3..fc1ab9f 100644
--- 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
index b9d1bf67db083d313c98ef10e271a1da05e101f2..339fbcc280d737e35907fc7e2b019b10c1d1c5ed 100755
GIT binary patch
delta 1087
zcmZ8gKW`H;6u(j>fs*!8i54Uz`cMZ3(x@PI1S*07bt*!F>E-SvXX>-Bwy$ZBP`a@p
zst$;ifgSY=Fd{wx3kx8zB6aBk1J6!-shZ^y-}C$Z&F<%^-5*nLuh!~O6gBqX?tDG!
zT>3f7zs|*rQJlq#2lMc8ZhtZUGdCR{@_E#V|Heo0;oiN4gBz`{agC4aGY3aY7g|%Z
zA68fA{N?H9a@3^egXZ$5t%c?YW^2*)+VVOL;J((Ia65YSC4Ju5AnTwT4z4x*#8NeJ
zEBfC1_U~Oa@%qZedUUh)rt#2Vk--`|?4l)m{<nH|xw$56qPNLFrU%du6Y0qWBsfx#
zkt|@SOUO}Sp8!<~TP2wxWTKzRAtYKUN*tx&Z+2h?jz3R@%fMyALSZm*B0(8AxBa?b
zyYHn0NoW{?v7LsLtmvx%Ao4;|PHN-;&(NCecNww?MyS4J7=l6%ScvY8FYuX$F7F4;
zJ9$oH3I-KR;E}@UE+asya}>&+W}Oi)GePoTgv$9nwjkD51|tj@vV~Tb{F~D9toK8Z
z1#O^P3YjwAiHppPSyrAT$YfG1SeNw>{(=>XtOeTEa+_>>Y*`4`?mv0d8evhe&0e8R
zGRkqKXNV>%$EoEyCFuznLb)=~hFKhow4DmR`m*6;vBcS>K&fzoO%f`RC5Hft+m`S?
zu*f-#_{4{v3S_9933|r;KuDtVO<X5^=f#AP9V&-AZ7*>^oH9R!>S>c>z+otl&?^;}
zLMxQQ4Lk6-szNGyJu<}32f8C)CvEzu#LKXN=@>dDakjE-fG%A@#>07v!myOQASawQ
zob#lVl^5P>uA>c^K`@f_wZ|=Q!-f|h?4TX*hmWW#@K!03O-`rFe+({^58$M`r&13=
N>wyBRW$86{{sUIZWCQ>J

delta 81
zcmZp8z}Rqrae_1}GXnzy+e8I>L1qR$#wcDOkBMK5fj@&^Y_p)kGQP=T{O@>}_`d<g
j8QA!L^M9M@D85-;;1oY=YLY@q>gI3qoC1toiwq0^)(I1C

diff --git a/exercises/01_nodejs/02_dynamic_website/bookshop/package.json b/exercises/01_nodejs/02_dynamic_website/bookshop/package.json
index bb51eec..6a345b1 100644
--- 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": {