From 014749917e5de9fe1885a1b1edc52b01cefa6f3f Mon Sep 17 00:00:00 2001
From: Maxime Dénès <mail@maximedenes.fr>
Date: Sun, 21 May 2017 14:50:25 +0200
Subject: Merge the ssr plugin.

---
 .merlin | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to '.merlin')

diff --git a/.merlin b/.merlin
index b78f24551..c8d7d322f 100644
--- a/.merlin
+++ b/.merlin
@@ -1,7 +1,5 @@
 FLG -rectypes -thread -safe-string -w +a-4-9-27-41-42-44-45-48-50
 
-S ltac
-B ltac
 S config
 B config
 S ide
@@ -46,4 +44,7 @@ B tools/coqdoc
 S dev
 B dev
 
+S plugins/**
+B plugins/**
+
 PKG threads.posix camlp5
-- 
cgit v1.2.3