From aa5b37e71dda0092c45e0c4c04a67435e70887c8 Mon Sep 17 00:00:00 2001
From: Ayo <ramon.aycojr@gmail.com>
Date: Tue, 28 Jul 2020 11:10:58 +0800
Subject: [PATCH] update template

---
 _ideas/YYYY-MM-DD-new-blog-template.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/_ideas/YYYY-MM-DD-new-blog-template.md b/_ideas/YYYY-MM-DD-new-blog-template.md
index 16073ae..604cf92 100644
--- a/_ideas/YYYY-MM-DD-new-blog-template.md
+++ b/_ideas/YYYY-MM-DD-new-blog-template.md
@@ -3,10 +3,6 @@ title: "Put Your Blog Title Here"
 permalink: "/blog-url"
 description: "Short description. Will be displayed when sharing blog post to Facebook."
 keywords: ""
-<<<<<<< HEAD
 image: "hello-world"
-=======
-image: "path-to-featured-image"
->>>>>>> 7f3ce1780d97836d3c4b07790ff9ea713a8463c4
 image-attrib: ""
 ---