From 863e6d411608c13bea4206892497931da78a1554 Mon Sep 17 00:00:00 2001
From: Jimmy Cai <github@jimmycai.com>
Date: Sat, 5 Mar 2022 17:14:24 +0000
Subject: [PATCH] Resolve merge conflict

---
 layouts/{ => _default}/rss.xml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename layouts/{ => _default}/rss.xml (100%)

diff --git a/layouts/rss.xml b/layouts/_default/rss.xml
similarity index 100%
rename from layouts/rss.xml
rename to layouts/_default/rss.xml