Fixed merge conflict

iCAPLyon1 · Nov 17, 2015 · 3529886 · 3529886
2 parents e128f33 + fcdeb34
commit 3529886
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/Listener/FormulaPluginListener.php b/Listener/FormulaPluginListener.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * This file is part of the Claroline Connect package
  *
@@ -9,7 +8,6 @@
  *
  * Date: 11/16/15
  */
-
 namespace Icap\FormulaPluginBundle\Listener;
 
 use Claroline\CoreBundle\Event\InjectJavascriptEvent;