From 0d6f58c54a7af6c8b4e6cd98663eb36ec4e3accc Mon Sep 17 00:00:00 2001 From: Owen Jacobson Date: Tue, 28 Jan 2020 20:49:17 -0500 Subject: 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. --- .../merging-structural-changes/ideal-merge-results.png | Bin 87122 -> 0 bytes .../mercurial-merge-results.png | Bin 99313 -> 0 bytes .../subversion-merge-results.png | Bin 114985 -> 0 bytes 3 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 static/media/dev/merging-structural-changes/ideal-merge-results.png delete mode 100644 static/media/dev/merging-structural-changes/mercurial-merge-results.png delete mode 100644 static/media/dev/merging-structural-changes/subversion-merge-results.png (limited to 'static/media/dev/merging-structural-changes') diff --git a/static/media/dev/merging-structural-changes/ideal-merge-results.png b/static/media/dev/merging-structural-changes/ideal-merge-results.png deleted file mode 100644 index cb78110..0000000 Binary files a/static/media/dev/merging-structural-changes/ideal-merge-results.png and /dev/null differ diff --git a/static/media/dev/merging-structural-changes/mercurial-merge-results.png b/static/media/dev/merging-structural-changes/mercurial-merge-results.png deleted file mode 100644 index d20f360..0000000 Binary files a/static/media/dev/merging-structural-changes/mercurial-merge-results.png and /dev/null differ diff --git a/static/media/dev/merging-structural-changes/subversion-merge-results.png b/static/media/dev/merging-structural-changes/subversion-merge-results.png deleted file mode 100644 index 5ef2570..0000000 Binary files a/static/media/dev/merging-structural-changes/subversion-merge-results.png and /dev/null differ -- cgit v1.2.3