From ac7267bab965d3b3f89ccc260e4e35032ca66116 Mon Sep 17 00:00:00 2001
From: in-session <info@in-session.de>
Date: Fri, 22 Jun 2018 08:50:03 +0200
Subject: [PATCH] Bug with Flux

https://forge.typo3.org/issues/85333
---
 ext_emconf.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ext_emconf.php b/ext_emconf.php
index 89f1cc7..4925074 100644
--- a/ext_emconf.php
+++ b/ext_emconf.php
@@ -31,6 +31,8 @@
         'conflicts' => [
             'templavoila' => '',
             'jfmulticontent' => '',
+            //https://forge.typo3.org/issues/85333
+			'flux' => '',
         ],
         'suggests' => [],
     ],