diff options
| author | Owen Jacobson <owen@grimoire.ca> | 2020-01-28 20:49:17 -0500 |
|---|---|---|
| committer | Owen Jacobson <owen@grimoire.ca> | 2020-01-28 23:23:18 -0500 |
| commit | 0d6f58c54a7af6c8b4e6cd98663eb36ec4e3accc (patch) | |
| tree | a2af4dc93f09a920b0ca375c1adde6d8f64eb6be /static/media/dev/merging-structural-changes | |
| parent | acf6f5d3bfa748e2f8810ab0fe807f82efcf3eb6 (diff) | |
Editorial pass & migration to mkdocs.
There's a lot in grimoire.ca that I either no longer stand behind or feel pretty weird about having out there.
Diffstat (limited to 'static/media/dev/merging-structural-changes')
| -rw-r--r-- | static/media/dev/merging-structural-changes/ideal-merge-results.png | bin | 87122 -> 0 bytes |
| -rw-r--r-- | static/media/dev/merging-structural-changes/mercurial-merge-results.png | bin | 99313 -> 0 bytes |
| -rw-r--r-- | static/media/dev/merging-structural-changes/subversion-merge-results.png | bin | 114985 -> 0 bytes |
3 files changed, 0 insertions, 0 deletions
diff --git a/static/media/dev/merging-structural-changes/ideal-merge-results.png b/static/media/dev/merging-structural-changes/ideal-merge-results.png Binary files differdeleted file mode 100644 index cb78110..0000000 --- a/static/media/dev/merging-structural-changes/ideal-merge-results.png +++ /dev/null diff --git a/static/media/dev/merging-structural-changes/mercurial-merge-results.png b/static/media/dev/merging-structural-changes/mercurial-merge-results.png Binary files differdeleted file mode 100644 index d20f360..0000000 --- a/static/media/dev/merging-structural-changes/mercurial-merge-results.png +++ /dev/null diff --git a/static/media/dev/merging-structural-changes/subversion-merge-results.png b/static/media/dev/merging-structural-changes/subversion-merge-results.png Binary files differdeleted file mode 100644 index 5ef2570..0000000 --- a/static/media/dev/merging-structural-changes/subversion-merge-results.png +++ /dev/null |
