diff options
| author | Bdale Garbee <bdale@gag.com> | 2013-08-28 15:19:15 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2013-08-28 15:19:15 -0600 |
| commit | 77f6661cd893dadf422376a7302be97105f4a9a8 (patch) | |
| tree | 35ab58eceb47c59e5039ec91c8b4d6b249e4ac43 /EasyMini.mdwn | |
| parent | 9bf704fa540dcd377503847f00bec1b3db26bbb6 (diff) | |
| parent | 02aadfc09bde9951cd4fa9b90241bd4c9af8e589 (diff) | |
TeleMini sn re-assigned from 92 to 96 to resolve conflict.
Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum
Conflicts:
production.mdwn
Diffstat (limited to 'EasyMini.mdwn')
| -rw-r--r-- | EasyMini.mdwn | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/EasyMini.mdwn b/EasyMini.mdwn new file mode 100644 index 0000000..2092a44 --- /dev/null +++ b/EasyMini.mdwn @@ -0,0 +1 @@ +[[!map pages="EasyMini/* and ! EasyMini/*/*"]] |