From f5a85f533dc487551759b6c97050c73d4f3415a4 Mon Sep 17 00:00:00 2001
From: Amigo <49749100+aamigo@users.noreply.github.com>
Date: Tue, 18 Jun 2019 13:01:44 +0200
Subject: [PATCH] Updated 015 Adding Templates and Layouts to a Site View
 (markdown)

---
 015-Adding-Templates-and-Layouts-to-a-Site-View.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/015-Adding-Templates-and-Layouts-to-a-Site-View.md b/015-Adding-Templates-and-Layouts-to-a-Site-View.md
index c2dad64..4922650 100644
--- a/015-Adding-Templates-and-Layouts-to-a-Site-View.md
+++ b/015-Adding-Templates-and-Layouts-to-a-Site-View.md
@@ -10,9 +10,7 @@ If we go to our example, (component, sermon distributor, view, preacher, and tem
 
 ### Preacher Site View Example
 
-The Default file is the main file. [00:01:20](https://www.youtube.com/watch?v=6VBbi3Rl2eY&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&t=00h01m20s) We call this the site view. (See video.) Everything in this file is built in the side view. Open the site view. This code here is in default view. This is added to that default file. (See video.) It says default view. [00:01:50](https://www.youtube.com/watch?v=6VBbi3Rl2eY&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&t=00h01m50s)
-
->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+The Default file is the main file. [00:01:20](https://www.youtube.com/watch?v=6VBbi3Rl2eY&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&t=00h01m20s) We call this the site view. (See video.) Everything in this file is built in the side view. Open the site view. This code here is in default view. This is added to that default file. (See video.) It says default view. [00:01:50](https://www.youtube.com/watch?v=6VBbi3Rl2eY&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&t=00h01m50s)>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
 ### Location Of Templates