diff options
| author | Jimmy Cai <github@jimmycai.com> | 2022-03-05 20:14:24 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-05 20:14:24 +0300 |
| commit | 863e6d411608c13bea4206892497931da78a1554 (patch) | |
| tree | 9d6d0f7f1760d359049e214bd4b91962fec47d33 | |
| parent | 72629cf476d939448010e789177a5f6796a2ad9f (diff) | |
Resolve merge conflict
| -rw-r--r-- | layouts/_default/rss.xml (renamed from layouts/rss.xml) | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/layouts/rss.xml b/layouts/_default/rss.xml index e9f3f1a..e9f3f1a 100644 --- a/layouts/rss.xml +++ b/layouts/_default/rss.xml |