From 76aed6ef732de38d82245b3d674f70bab30221e5 Mon Sep 17 00:00:00 2001 From: Owen Jacobson Date: Fri, 3 Jul 2015 22:31:49 -0400 Subject: Fuck it, serve the files directly. --- .../dev/merging-structural-changes/_list.html | 102 +++++++++++++++++++++ .../ideal-merge-results.png | Bin 0 -> 87122 bytes .../dev/merging-structural-changes/index.html | 102 +++++++++++++++++++++ .../mercurial-merge-results.png | Bin 0 -> 99313 bytes .../subversion-merge-results.png | Bin 0 -> 114985 bytes 5 files changed, 204 insertions(+) create mode 100644 .html/media/dev/merging-structural-changes/_list.html create mode 100644 .html/media/dev/merging-structural-changes/ideal-merge-results.png create mode 100644 .html/media/dev/merging-structural-changes/index.html create mode 100644 .html/media/dev/merging-structural-changes/mercurial-merge-results.png create mode 100644 .html/media/dev/merging-structural-changes/subversion-merge-results.png (limited to '.html/media/dev/merging-structural-changes') diff --git a/.html/media/dev/merging-structural-changes/_list.html b/.html/media/dev/merging-structural-changes/_list.html new file mode 100644 index 0000000..bbdf659 --- /dev/null +++ b/.html/media/dev/merging-structural-changes/_list.html @@ -0,0 +1,102 @@ + + + + + The Codex » + ls /media/dev/merging-structural-changes + + + + + + + + +
+ + + + + +
+

ls /media/dev/merging-structural-changes

+ + + + + + + + +
+ + + + + + + + +
+ + \ No newline at end of file diff --git a/.html/media/dev/merging-structural-changes/ideal-merge-results.png b/.html/media/dev/merging-structural-changes/ideal-merge-results.png new file mode 100644 index 0000000..cb78110 Binary files /dev/null and b/.html/media/dev/merging-structural-changes/ideal-merge-results.png differ diff --git a/.html/media/dev/merging-structural-changes/index.html b/.html/media/dev/merging-structural-changes/index.html new file mode 100644 index 0000000..bbdf659 --- /dev/null +++ b/.html/media/dev/merging-structural-changes/index.html @@ -0,0 +1,102 @@ + + + + + The Codex » + ls /media/dev/merging-structural-changes + + + + + + + + +
+ + + + + +
+

ls /media/dev/merging-structural-changes

+ + + + + + + + +
+ + + + + + + + +
+ + \ No newline at end of file diff --git a/.html/media/dev/merging-structural-changes/mercurial-merge-results.png b/.html/media/dev/merging-structural-changes/mercurial-merge-results.png new file mode 100644 index 0000000..d20f360 Binary files /dev/null and b/.html/media/dev/merging-structural-changes/mercurial-merge-results.png differ diff --git a/.html/media/dev/merging-structural-changes/subversion-merge-results.png b/.html/media/dev/merging-structural-changes/subversion-merge-results.png new file mode 100644 index 0000000..5ef2570 Binary files /dev/null and b/.html/media/dev/merging-structural-changes/subversion-merge-results.png differ -- cgit v1.2.3