summaryrefslogtreecommitdiff
path: root/.html/media/dev/merging-structural-changes/index.html
diff options
context:
space:
mode:
Diffstat (limited to '.html/media/dev/merging-structural-changes/index.html')
-rw-r--r--.html/media/dev/merging-structural-changes/index.html102
1 files changed, 0 insertions, 102 deletions
diff --git a/.html/media/dev/merging-structural-changes/index.html b/.html/media/dev/merging-structural-changes/index.html
deleted file mode 100644
index bbdf659..0000000
--- a/.html/media/dev/merging-structural-changes/index.html
+++ /dev/null
@@ -1,102 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <title>
- The Codex »
- ls /media/dev/merging-structural-changes
- </title>
-
- <link
- rel='stylesheet'
- type='text/css'
- href='http://fonts.googleapis.com/css?family=Buenard:400,700&amp;subset=latin,latin-ext'>
- <link
- rel="stylesheet"
- type="text/css"
- href="../../css/reset.css">
- <link
- rel="stylesheet"
- type="text/css"
- href="../../css/grimoire.css">
-</head>
-<body>
-
-<div id="shell">
-
- <ol id="breadcrumbs">
-
- <li class="crumb-0 not-last">
-
- <a href="../../../">index</a>
-
- </li>
-
- <li class="crumb-1 not-last">
-
- <a href="../../">media</a>
-
- </li>
-
- <li class="crumb-2 not-last">
-
- <a href="../">dev</a>
-
- </li>
-
- <li class="crumb-3 not-last">
-
- <a href="./">merging-structural-changes</a>
-
- </li>
-
- <li class="crumb-4 last">
-
- <span class="list-crumb">list</span>
-
- </li>
-
- </ol>
-
-
-
- <div id="listing">
- <h1><code>ls /media/dev/merging-structural-changes</code></h1>
-
-
-
-
-
-
- <div id="files">
- <h2>Files</h2>
-
- <li><a href="ideal-merge-results.png">ideal-merge-results.png</a></li>
-
- <li><a href="mercurial-merge-results.png">mercurial-merge-results.png</a></li>
-
- <li><a href="subversion-merge-results.png">subversion-merge-results.png</a></li>
-
- </div>
-
- </div>
-
-
-
-
-
-
- <div id="footer">
- <p>
-
- The Codex —
-
- Powered by <a href="http://markdoc.org/">Markdoc</a>.
-
-<a href="https://bitbucket.org/ojacobson/grimoire.ca/src/master/wiki/media/dev/merging-structural-changes">See this directory on Bitbucket</a>.
-
- </p>
- </div>
-
-</div>
-</body>
-</html> \ No newline at end of file