From a036e8c790a5fc882d0b31a25d3c7d726fa819e1 Mon Sep 17 00:00:00 2001
From: Jon French
Date: Wed, 29 Aug 2018 15:42:39 +0100
Subject: sync and centralise the two .merlin files

---
 .merlin     | 3 ++-
 src/.merlin | 8 --------
 2 files changed, 2 insertions(+), 9 deletions(-)
 delete mode 100644 src/.merlin

diff --git a/.merlin b/.merlin
index 3b8cebea..7d00b00d 100644
--- a/.merlin
+++ b/.merlin
@@ -1,3 +1,4 @@
+FLG -w -3
 FLG -w -26
 FLG -w -32
 
@@ -8,4 +9,4 @@ S src/lem_interp/**
 S src/pprint/**
 S src/test/**
 B src/_build/**
-PKG num str unix uint zarith
\ No newline at end of file
+PKG num str unix uint zarith linksem lem
\ No newline at end of file
diff --git a/src/.merlin b/src/.merlin
deleted file mode 100644
index b9fefd29..00000000
--- a/src/.merlin
+++ /dev/null
@@ -1,8 +0,0 @@
-S .
-S lem_interp/
-B _build/
-B _build/lem_interp/
-B _build/pprint/src/
-PKG zarith
-PKG linksem
-PKG lem
\ No newline at end of file
-- 
cgit v1.2.3