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/static | |
| 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/static')
| -rw-r--r-- | content/static/stork_toml.md | 2 | ||||
| -rw-r--r-- | content/static/tinysearch_json.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/content/static/stork_toml.md b/content/static/stork_toml.md index 0f7b8a4..e427a93 100644 --- a/content/static/stork_toml.md +++ b/content/static/stork_toml.md @@ -2,4 +2,4 @@ path = "data_stork" template = "stork_toml.html" draft = true -+++
\ No newline at end of file ++++ diff --git a/content/static/tinysearch_json.md b/content/static/tinysearch_json.md index c0125f1..c91a639 100644 --- a/content/static/tinysearch_json.md +++ b/content/static/tinysearch_json.md @@ -2,4 +2,4 @@ path = "data_tinysearch" template = "tinysearch_json.html" draft = true -+++
\ No newline at end of file ++++ |