diff options
| author | Jieiku | 2023-08-17 12:16:18 -0700 |
|---|---|---|
| committer | Jieiku | 2023-08-17 12:16:18 -0700 |
| commit | 3e5d8a96e9eae21a799f327cd8a52adb891ebe66 (patch) | |
| tree | 6a1377b5207e4e3555f65ca162014468c64d6985 /content/archive | |
| parent | 1d9be812c25508a5dc36afb9e80669b668a47190 (diff) | |
| parent | 0983915e23793c28dd0bee149fd2ec05a7e96a94 (diff) | |
| download | abridge-3e5d8a96e9eae21a799f327cd8a52adb891ebe66.tar.gz abridge-3e5d8a96e9eae21a799f327cd8a52adb891ebe66.tar.bz2 abridge-3e5d8a96e9eae21a799f327cd8a52adb891ebe66.zip | |
resolve merge conflicts
Diffstat (limited to 'content/archive')
| -rw-r--r-- | content/archive/_index.fr.md | 3 | ||||
| -rw-r--r-- | content/archive/_index.md | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/content/archive/_index.fr.md b/content/archive/_index.fr.md new file mode 100644 index 0000000..b1a35cf --- /dev/null +++ b/content/archive/_index.fr.md @@ -0,0 +1,3 @@ ++++ +template = "archive.html" ++++ diff --git a/content/archive/_index.md b/content/archive/_index.md new file mode 100644 index 0000000..b1a35cf --- /dev/null +++ b/content/archive/_index.md @@ -0,0 +1,3 @@ ++++ +template = "archive.html" ++++ |