[FIX] Merge EM depends and conflicts constraints, see #2

fnagel · Aug 7, 2014 · 6335201 · 6335201
1 parent 6140074
commit 6335201
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/ext_emconf.php b/ext_emconf.php
@@ -32,11 +32,11 @@
  'conflicts' => '',
  'constraints' => array(
  'depends' => array(
- 'typo3' => '6.0.0-6.2.99',
+ 'typo3' => '6.0.7-6.2.99',
  ),
  'conflicts' => array(
  'scriptmerger' => '',
- 'typo3' => '6.0.0,6.0.1,6.0.2,6.0.3,6.0.4,6.0.5,6.0.7,6.1.0,6.1.1,6.1.2',
+ 'typo3' => '6.1.0,6.1.1,6.1.2',
  ),
  'suggests' => array(),
  ),