summaryrefslogtreecommitdiff
path: root/.merlin
diff options
context:
space:
mode:
authorJon French2019-02-13 12:27:48 +0000
committerJon French2019-02-13 12:27:48 +0000
commitea39b3c674570ce5eea34067c36d5196ca201f83 (patch)
tree516e7491bc32797a4d0ac397ea47387f2b16cf1b /.merlin
parentab3f3671d4dd682b2aee922d5a05e9455afd5849 (diff)
parent24fc989891ad266eae642815646294279e2485ca (diff)
Merge branch 'sail2' into rmem_interpreter
Diffstat (limited to '.merlin')
-rw-r--r--.merlin2
1 files changed, 1 insertions, 1 deletions
diff --git a/.merlin b/.merlin
index e830e8f4..545d6f32 100644
--- a/.merlin
+++ b/.merlin
@@ -9,4 +9,4 @@ S src/lem_interp/**
S src/pprint/**
S src/test/**
B src/_build/**
-PKG num str unix uint zarith linksem lem omd linenoise base64
+PKG num str unix uint zarith linksem lem omd linenoise base64 yojson