aboutsummaryrefslogtreecommitdiffhomepage
path: root/ide
diff options
context:
space:
mode:
authorGravatar Enrico Tassi <Enrico.Tassi@inria.fr>2018-07-18 17:21:33 +0200
committerGravatar Enrico Tassi <Enrico.Tassi@inria.fr>2018-07-18 17:21:33 +0200
commit6b99def0765b4b88773c3c9c272552035a7da3d1 (patch)
treedc6e2edea6bb9b9ef8d9cb078be34eece3f89f66 /ide
parent8271b23dd0a26bba79c7d6dadd92d2329945675c (diff)
parent1419bb9ddd1299673707404f1f35b4904648760b (diff)
Merge PR #8054: [dev] Autogenerate OCaml dev files.
Diffstat (limited to 'ide')
-rw-r--r--ide/.merlin.in (renamed from ide/.merlin)0
1 files changed, 0 insertions, 0 deletions
diff --git a/ide/.merlin b/ide/.merlin.in
index 953b5dce4..953b5dce4 100644
--- a/ide/.merlin
+++ b/ide/.merlin.in