bad merge from upstream fixed

YuriGor · YuriGor · commit 90d414860055 · 2018-12-02T04:17:33.000+03:00
diff --git a/book/5-end/server/models/EmailTemplate.js b/book/5-end/server/models/EmailTemplate.js
@@ -46,11 +46,9 @@ function insertTemplates() {
       return;
     }
 
-    EmailTemplate
-      .create(template)
-      .catch((error) => {
-        logger.error('EmailTemplate insertion error:', error);
-      });
+    EmailTemplate.create(template).catch((error) => {
+      logger.error('EmailTemplate insertion error:', error);
+    });
   });
 }
 
@@ -65,12 +63,7 @@ export default async function getEmailTemplate(name, params) {
   }
 
   return {
-<<<<<<< HEAD
-    message: _.template.compile(source.message)(params),
-    subject: _.template.compile(source.subject)(params),
-=======
     message: _.template(source.message)(params),
     subject: _.template(source.subject)(params),
->>>>>>> upstream/master
   };
 }
diff --git a/book/5-start/server/models/EmailTemplate.js b/book/5-start/server/models/EmailTemplate.js
@@ -46,11 +46,9 @@ function insertTemplates() {
       return;
     }
 
-    EmailTemplate
-      .create(template)
-      .catch((error) => {
-        logger.error('EmailTemplate insertion error:', error);
-      });
+    EmailTemplate.create(template).catch((error) => {
+      logger.error('EmailTemplate insertion error:', error);
+    });
   });
 }
 
@@ -65,12 +63,7 @@ export default async function getEmailTemplate(name, params) {
   }
 
   return {
-<<<<<<< HEAD
-    message: _.template.compile(source.message)(params),
-    subject: _.template.compile(source.subject)(params),
-=======
     message: _.template(source.message)(params),
     subject: _.template(source.subject)(params),
->>>>>>> upstream/master
   };
 }
diff --git a/book/6-end/server/models/EmailTemplate.js b/book/6-end/server/models/EmailTemplate.js
@@ -46,11 +46,9 @@ function insertTemplates() {
       return;
     }
 
-    EmailTemplate
-      .create(template)
-      .catch((error) => {
-        logger.error('EmailTemplate insertion error:', error);
-      });
+    EmailTemplate.create(template).catch((error) => {
+      logger.error('EmailTemplate insertion error:', error);
+    });
   });
 }
 
@@ -65,12 +63,7 @@ export default async function getEmailTemplate(name, params) {
   }
 
   return {
-<<<<<<< HEAD
-    message: _.template.compile(source.message)(params),
-    subject: _.template.compile(source.subject)(params),
-=======
     message: _.template(source.message)(params),
     subject: _.template(source.subject)(params),
->>>>>>> upstream/master
   };
 }
diff --git a/book/6-start/server/models/EmailTemplate.js b/book/6-start/server/models/EmailTemplate.js
@@ -46,11 +46,9 @@ function insertTemplates() {
       return;
     }
 
-    EmailTemplate
-      .create(template)
-      .catch((error) => {
-        logger.error('EmailTemplate insertion error:', error);
-      });
+    EmailTemplate.create(template).catch((error) => {
+      logger.error('EmailTemplate insertion error:', error);
+    });
   });
 }
 
@@ -65,12 +63,7 @@ export default async function getEmailTemplate(name, params) {
   }
 
   return {
-<<<<<<< HEAD
-    message: _.template.compile(source.message)(params),
-    subject: _.template.compile(source.subject)(params),
-=======
     message: _.template(source.message)(params),
     subject: _.template(source.subject)(params),
->>>>>>> upstream/master
   };
 }
diff --git a/book/7-end/server/models/EmailTemplate.js b/book/7-end/server/models/EmailTemplate.js
@@ -46,11 +46,9 @@ function insertTemplates() {
       return;
     }
 
-    EmailTemplate
-      .create(template)
-      .catch((error) => {
-        logger.error('EmailTemplate insertion error:', error);
-      });
+    EmailTemplate.create(template).catch((error) => {
+      logger.error('EmailTemplate insertion error:', error);
+    });
   });
 }
 
@@ -65,12 +63,7 @@ export default async function getEmailTemplate(name, params) {
   }
 
   return {
-<<<<<<< HEAD
-    message: _.template.compile(source.message)(params),
-    subject: _.template.compile(source.subject)(params),
-=======
     message: _.template(source.message)(params),
     subject: _.template(source.subject)(params),
->>>>>>> upstream/master
   };
 }
diff --git a/book/7-start/server/models/EmailTemplate.js b/book/7-start/server/models/EmailTemplate.js
@@ -46,11 +46,9 @@ function insertTemplates() {
       return;
     }
 
-    EmailTemplate
-      .create(template)
-      .catch((error) => {
-        logger.error('EmailTemplate insertion error:', error);
-      });
+    EmailTemplate.create(template).catch((error) => {
+      logger.error('EmailTemplate insertion error:', error);
+    });
   });
 }
 
@@ -65,12 +63,7 @@ export default async function getEmailTemplate(name, params) {
   }
 
   return {
-<<<<<<< HEAD
-    message: _.template.compile(source.message)(params),
-    subject: _.template.compile(source.subject)(params),
-=======
     message: _.template(source.message)(params),
     subject: _.template(source.subject)(params),
->>>>>>> upstream/master
   };
 }
diff --git a/book/8-end/server/models/EmailTemplate.js b/book/8-end/server/models/EmailTemplate.js
@@ -82,12 +82,7 @@ export default async function getEmailTemplate(name, params) {
   }
 
   return {
-<<<<<<< HEAD
-    message: _.template.compile(source.message)(params),
-    subject: _.template.compile(source.subject)(params),
-=======
     message: _.template(source.message)(params),
     subject: _.template(source.subject)(params),
->>>>>>> upstream/master
   };
 }
diff --git a/book/8-start/server/models/EmailTemplate.js b/book/8-start/server/models/EmailTemplate.js
@@ -46,11 +46,9 @@ function insertTemplates() {
       return;
     }
 
-    EmailTemplate
-      .create(template)
-      .catch((error) => {
-        logger.error('EmailTemplate insertion error:', error);
-      });
+    EmailTemplate.create(template).catch((error) => {
+      logger.error('EmailTemplate insertion error:', error);
+    });
   });
 }
 
@@ -65,12 +63,7 @@ export default async function getEmailTemplate(name, params) {
   }
 
   return {
-<<<<<<< HEAD
-    message: _.template.compile(source.message)(params),
-    subject: _.template.compile(source.subject)(params),
-=======
     message: _.template(source.message)(params),
     subject: _.template(source.subject)(params),
->>>>>>> upstream/master
   };
 }
diff --git a/book/bonus-end/server/models/EmailTemplate.js b/book/bonus-end/server/models/EmailTemplate.js
diff --git a/book/bonus-start/server/aws.js b/book/bonus-start/server/aws.js
diff --git a/book/bonus-start/server/models/EmailTemplate.js b/book/bonus-start/server/models/EmailTemplate.js

Original file line number	Diff line number	Diff line change
`@@ -46,11 +46,9 @@ function insertTemplates() {`
`46`	`46`	`return;`
`47`	`47`	`}`
`48`	`48`
`49`		`- EmailTemplate`
`50`		`- .create(template)`
`51`		`- .catch((error) => {`
`52`		`- logger.error('EmailTemplate insertion error:', error);`
`53`		`- });`
	`49`	`+ EmailTemplate.create(template).catch((error) => {`
	`50`	`+ logger.error('EmailTemplate insertion error:', error);`
	`51`	`+ });`
`54`	`52`	`});`
`55`	`53`	`}`
`56`	`54`
`@@ -65,12 +63,7 @@ export default async function getEmailTemplate(name, params) {`
`65`	`63`	`}`
`66`	`64`
`67`	`65`	`return {`
`68`		`-<<<<<<< HEAD`
`69`		`- message: _.template.compile(source.message)(params),`
`70`		`- subject: _.template.compile(source.subject)(params),`
`71`		`-=======`
`72`	`66`	`message: _.template(source.message)(params),`
`73`	`67`	`subject: _.template(source.subject)(params),`
`74`		`->>>>>>> upstream/master`
`75`	`68`	`};`
`76`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,12 +82,7 @@ export default async function getEmailTemplate(name, params) {`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`return {`
`85`		`-<<<<<<< HEAD`
`86`		`- message: _.template.compile(source.message)(params),`
`87`		`- subject: _.template.compile(source.subject)(params),`
`88`		`-=======`
`89`	`85`	`message: _.template(source.message)(params),`
`90`	`86`	`subject: _.template(source.subject)(params),`
`91`		`->>>>>>> upstream/master`
`92`	`87`	`};`
`93`	`88`	`}`