From 25d26c0fbd7313ea724bb0affd2cff9869af0ef1 Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Fri, 12 Oct 2018 10:52:40 +0200
Subject: [PATCH] System/mxm: set use-flag 'merlin'

---
 System/mxm/build                | 2 --
 System/mxm/files/variants.Linux | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/System/mxm/build b/System/mxm/build
index 92bf035..595506c 100755
--- a/System/mxm/build
+++ b/System/mxm/build
@@ -1,7 +1,5 @@
 #!/usr/bin/env modbuild
 
-# :FIXME: needs review
-
 pbuild::prep() {
 	:
 }
diff --git a/System/mxm/files/variants.Linux b/System/mxm/files/variants.Linux
index 6aefe21..bf473c6 100644
--- a/System/mxm/files/variants.Linux
+++ b/System/mxm/files/variants.Linux
@@ -1 +1 @@
-mxm/3.6.3104	unstable
+mxm/3.6.3104_merlin	unstable