diff options
| author |  Benjamin Barenblat <bbaren@mit.edu> | 2018-06-17 09:12:52 -0400 |
|---|---|---|
| committer | Benjamin Barenblat <bbaren@mit.edu> | 2018-06-17 09:12:52 -0400 |
| commit | 095c2640aa2070ed4e2765875238d5e6e6673856 (patch) | |
| tree | 9306beb3fef29a99d9436dc00e2d8c57fb3e0c7b /src/demo.sml | |
| parent | 8c58ba2e1db6e97ca1f18fd9ca52ffead53e4a4f (diff) | |
| parent | 34eb9eba9a724433f9c37c39cf43e9e10cf55220 (diff) | |
Merge branch 'upstream' into dfsg_clean20180616+dfsg
Diffstat (limited to 'src/demo.sml')
| -rw-r--r-- | src/demo.sml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/demo.sml b/src/demo.sml index 62b9037a..1e58e2f8 100644 --- a/src/demo.sml +++ b/src/demo.sml @@ -123,9 +123,11 @@ fun make' {prefix, dirname, guided} = protocol = mergeWith #2 (#protocol combined, #protocol urp), dbms = mergeWith #2 (#dbms combined, #dbms urp), sigFile = mergeWith #2 (#sigFile combined, #sigFile urp), + fileCache = mergeWith #2 (#fileCache combined, #fileCache urp), safeGets = #safeGets combined @ #safeGets urp, onError = NONE, - minHeap = 0 + minHeap = 0, + mimeTypes = mergeWith #2 (#mimeTypes combined, #mimeTypes urp) } val parse = Compiler.run (Compiler.transform Compiler.parseUrp "Demo parseUrp") |